PL-5310 Move com.haulmont.cuba.gui.categories to com.haulmont.cuba.gui.app.core

#PL-5310

modules/global/src/com/haulmont/cuba/core/entity/CategoryAttribute.java

@@ -29,10 +29,10 @@ public class CategoryAttribute extends StandardEntity {
     @JoinColumn(name = "CATEGORY_ID")
     private Category category;
 
-    @Column(name = "NAME", length = NAME_FIELD_LENGTH)
+    @Column(name = "NAME", length = NAME_FIELD_LENGTH, nullable = false)
     private String name;
 
-    @Column(name = "CODE", length = CODE_FIELD_LENGTH)
+    @Column(name = "CODE", length = CODE_FIELD_LENGTH, nullable = false)
     private String code;
 
     @Column(name = "ENUMERATION")
@@ -57,7 +57,7 @@ public class CategoryAttribute extends StandardEntity {
     private Boolean lookup = false;
 
     @Column(name = "TARGET_SCREENS")
-    private String targetScreens;//comma separated list of screenId#componentId pairs. componentId might not exist
+    private String targetScreens;//comma separated list of screenId#componentId pairs. componentId might be empty
 
     @Column(name = "DEFAULT_STRING")
     private String defaultString;

modules/gui/src/com/haulmont/cuba/gui/app/core/categories/AttributeEditor.java

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2008-2013 Haulmont. All rights reserved.
+ * Copyright (c) 2008-2015 Haulmont. All rights reserved.
  * Use is subject to license terms, see http://www.cuba-platform.com/license for details.
  */
 
-package com.haulmont.cuba.gui.categories;
+package com.haulmont.cuba.gui.app.core.categories;
 
 import com.haulmont.chile.core.datatypes.Datatypes;
 import com.haulmont.chile.core.model.MetaClass;
@@ -117,6 +117,7 @@ public class AttributeEditor extends AbstractEditor<CategoryAttribute> {
 
         codeField = factory.createComponent(TextField.NAME);
         codeField.setId("code");
+        codeField.setRequired(true);
         codeField.setCaption(getMessage("code"));
         codeField.setWidth(fieldWidth);
         codeField.setFrame(frame);

modules/gui/src/com/haulmont/cuba/gui/app/core/categories/CategoryAttrsFrame.java

@@ -1,17 +1,21 @@
 /*
- * Copyright (c) 2008-2013 Haulmont. All rights reserved.
+ * Copyright (c) 2008-2015 Haulmont. All rights reserved.
  * Use is subject to license terms, see http://www.cuba-platform.com/license for details.
  */
 
-package com.haulmont.cuba.gui.categories;
+package com.haulmont.cuba.gui.app.core.categories;
 
 import com.haulmont.chile.core.datatypes.Datatypes;
 import com.haulmont.chile.core.model.MetaClass;
 import com.haulmont.chile.core.model.utils.InstanceUtils;
+import com.haulmont.cuba.core.app.dynamicattributes.PropertyType;
 import com.haulmont.cuba.core.entity.Category;
 import com.haulmont.cuba.core.entity.CategoryAttribute;
 import com.haulmont.cuba.core.entity.Entity;
-import com.haulmont.cuba.core.global.*;
+import com.haulmont.cuba.core.global.LoadContext;
+import com.haulmont.cuba.core.global.MessageTools;
+import com.haulmont.cuba.core.global.Metadata;
+import com.haulmont.cuba.core.global.UserSessionSource;
 import com.haulmont.cuba.gui.WindowManager;
 import com.haulmont.cuba.gui.components.*;
 import com.haulmont.cuba.gui.components.actions.ItemTrackingAction;
@@ -19,7 +23,6 @@ import com.haulmont.cuba.gui.components.actions.RefreshAction;
 import com.haulmont.cuba.gui.components.actions.RemoveAction;
 import com.haulmont.cuba.gui.data.DataSupplier;
 import com.haulmont.cuba.gui.data.Datasource;
-import com.haulmont.cuba.core.app.dynamicattributes.PropertyType;
 import com.haulmont.cuba.gui.data.impl.CollectionPropertyDatasourceImpl;
 import com.haulmont.cuba.gui.data.impl.DsListenerAdapter;
 import com.haulmont.cuba.gui.xml.layout.ComponentsFactory;
@@ -247,7 +250,7 @@ public class CategoryAttrsFrame extends AbstractFrame {
         }
 
         @Override
-        public void actionPerform(com.haulmont.cuba.gui.components.Component component) {
+        public void actionPerform(Component component) {
             Set<CategoryAttribute> selected = categoryAttrsTable.getSelected();
             if (!selected.isEmpty()) {
                 AttributeEditor editor = openEditor(
@@ -280,7 +283,7 @@ public class CategoryAttrsFrame extends AbstractFrame {
         }
 
         @Override
-        public void actionPerform(com.haulmont.cuba.gui.components.Component component) {
+        public void actionPerform(Component component) {
             final CategoryAttribute attribute = metadata.create(CategoryAttribute.class);
             attribute.setCategory((Category) categoryDs.getItem());
             assignNextOrderNo(attribute);

modules/gui/src/com/haulmont/cuba/gui/app/core/categories/CategoryBrowser.java

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2008-2013 Haulmont. All rights reserved.
+ * Copyright (c) 2008-2015 Haulmont. All rights reserved.
  * Use is subject to license terms, see http://www.cuba-platform.com/license for details.
  */
 
-package com.haulmont.cuba.gui.categories;
+package com.haulmont.cuba.gui.app.core.categories;
 
 import com.haulmont.chile.core.model.MetaClass;
 import com.haulmont.cuba.core.entity.Category;

modules/gui/src/com/haulmont/cuba/gui/app/core/categories/CategoryEditor.java

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2008-2013 Haulmont. All rights reserved.
+ * Copyright (c) 2008-2015 Haulmont. All rights reserved.
  * Use is subject to license terms, see http://www.cuba-platform.com/license for details.
  */
 
-package com.haulmont.cuba.gui.categories;
+package com.haulmont.cuba.gui.app.core.categories;
 
 import com.haulmont.chile.core.model.MetaClass;
 import com.haulmont.cuba.core.entity.Category;

modules/gui/src/com/haulmont/cuba/gui/app/core/categories/ScreenAndComponent.java

@@ -3,7 +3,7 @@
  * Use is subject to license terms, see http://www.cuba-platform.com/license for details.
  */
 
-package com.haulmont.cuba.gui.categories;
+package com.haulmont.cuba.gui.app.core.categories;
 
 import com.haulmont.chile.core.annotations.MetaClass;
 import com.haulmont.chile.core.annotations.MetaProperty;

modules/gui/src/com/haulmont/cuba/gui/app/core/categories/attribute-edit.xml

@@ -1,11 +1,11 @@
 <!--
-  ~ Copyright (c) 2008-2013 Haulmont. All rights reserved.
+  ~ Copyright (c) 2008-2015 Haulmont. All rights reserved.
   ~ Use is subject to license terms, see http://www.cuba-platform.com/license for details.
   -->
 
 <window xmlns="http://schemas.haulmont.com/cuba/5.4/window.xsd"
-        class="com.haulmont.cuba.gui.categories.AttributeEditor"
+        class="com.haulmont.cuba.gui.app.core.categories.AttributeEditor"
-        messagesPack="com.haulmont.cuba.gui.categories"
+        messagesPack="com.haulmont.cuba.gui.app.core.categories"
         datasource="attributeDs"
         caption="msg://AttributeEditor.caption">
     <dsContext>
@@ -15,7 +15,7 @@
                 view="category.edit"
                 >
         </datasource>
-        <collectionDatasource id="screensDs" class="com.haulmont.cuba.gui.categories.ScreenAndComponent"
+        <collectionDatasource id="screensDs" class="com.haulmont.cuba.gui.app.core.categories.ScreenAndComponent"
                               allowCommit="false" refreshMode="NEVER"/>
     </dsContext>
     <layout spacing="true" expand="buttons">

modules/gui/src/com/haulmont/cuba/gui/app/core/categories/category-attrs-frame.xml

@@ -1,11 +1,11 @@
 <!--
-  ~ Copyright (c) 2008-2013 Haulmont. All rights reserved.
+  ~ Copyright (c) 2008-2015 Haulmont. All rights reserved.
   ~ Use is subject to license terms, see http://www.cuba-platform.com/license for details.
   -->
 
 <window xmlns="http://schemas.haulmont.com/cuba/5.4/window.xsd"
-        class="com.haulmont.cuba.gui.categories.CategoryAttrsFrame"
+        class="com.haulmont.cuba.gui.app.core.categories.CategoryAttrsFrame"
-        messagesPack="com.haulmont.cuba.gui.categories">
+        messagesPack="com.haulmont.cuba.gui.app.core.categories">
 
     <layout height="100%" spacing="true">
         <table id="categoryAttrsTable" presentations="true" width="100%" height="100%">

modules/gui/src/com/haulmont/cuba/gui/app/core/categories/category-browse.xml

@@ -1,11 +1,11 @@
 <!--
-  ~ Copyright (c) 2008-2013 Haulmont. All rights reserved.
+  ~ Copyright (c) 2008-2015 Haulmont. All rights reserved.
   ~ Use is subject to license terms, see http://www.cuba-platform.com/license for details.
   -->
 
 <window xmlns="http://schemas.haulmont.com/cuba/5.4/window.xsd"
-        class="com.haulmont.cuba.gui.categories.CategoryBrowser"
+        class="com.haulmont.cuba.gui.app.core.categories.CategoryBrowser"
-        messagesPack="com.haulmont.cuba.gui.categories"
+        messagesPack="com.haulmont.cuba.gui.app.core.categories"
         lookupComponent="categoryTable"
         caption="msg://categories"
         focusComponent="categoriesFilter">

modules/gui/src/com/haulmont/cuba/gui/app/core/categories/category-edit.xml

@@ -1,10 +1,10 @@
 <!--
-  ~ Copyright (c) 2008-2013 Haulmont. All rights reserved.
+  ~ Copyright (c) 2008-2015 Haulmont. All rights reserved.
   ~ Use is subject to license terms, see http://www.cuba-platform.com/license for details.
   -->
 <window xmlns="http://schemas.haulmont.com/cuba/5.4/window.xsd"
-        class="com.haulmont.cuba.gui.categories.CategoryEditor"
+        class="com.haulmont.cuba.gui.app.core.categories.CategoryEditor"
-        messagesPack="com.haulmont.cuba.gui.categories"
+        messagesPack="com.haulmont.cuba.gui.app.core.categories"
         caption="msg://editorCaption"
         datasource="categoryDs"
         focusComponent="name">
@@ -30,7 +30,7 @@
         </hbox>
         <label value="msg://attributes" stylename="h2"/>
 
-        <iframe id="categoryAttrsFrame" src="/com/haulmont/cuba/gui/categories/category-attrs-frame.xml"/>
+        <iframe id="categoryAttrsFrame" src="/com/haulmont/cuba/gui/app/core/categories/category-attrs-frame.xml"/>
 
         <iframe id="windowActions" src="/com/haulmont/cuba/gui/edit-window.actions.xml"/>
     </layout>

modules/gui/src/com/haulmont/cuba/gui/cuba-screens.xml

@@ -92,13 +92,13 @@
             template="/com/haulmont/cuba/gui/app/core/file/file-edit.xml"/>
 
     <screen id="sys$Category.browse"
-            template="/com/haulmont/cuba/gui/categories/category-browse.xml"/>
+            template="/com/haulmont/cuba/gui/app/core/categories/category-browse.xml"/>
 
     <screen id="sys$Category.edit"
-            template="/com/haulmont/cuba/gui/categories/category-edit.xml"/>
+            template="/com/haulmont/cuba/gui/app/core/categories/category-edit.xml"/>
 
     <screen id="sys$CategoryAttribute.edit"
-            template="/com/haulmont/cuba/gui/categories/attribute-edit.xml"/>
+            template="/com/haulmont/cuba/gui/app/core/categories/attribute-edit.xml"/>
 
     <screen id="sys$EntitySnapshot.view"
             template="/com/haulmont/cuba/gui/app/core/entitydiff/diff-view.xml"/>
@@ -119,7 +119,7 @@
             template="/com/haulmont/cuba/gui/app/core/entityinspector/entity-inspector-edit.xml"/>
 
     <screen id="runtimePropertiesFrame"
-            template="/com/haulmont/cuba/gui/runtimeprops/runtime-properties-frame.xml"/>
+            template="/com/haulmont/cuba/gui/app/core/dynamicattributes/runtime-properties-frame.xml"/>
 
     <screen id="aboutWindow"
             template="/com/haulmont/cuba/gui/app/core/about/about-window.xml"/>

modules/gui/src/com/haulmont/cuba/gui/data/impl/RuntimePropsDatasourceImpl.java

@@ -93,6 +93,9 @@ public class RuntimePropsDatasourceImpl
         }
         if (!initializedBefore && category == null) {
             category = getDefaultCategory(entity);
+            if (mainDs.getMetaClass().getProperty("category") != null) {
+                entity.setValue("category", category);
+            }
         }
 
         item = new DynamicAttributesEntity(metaClass);

modules/gui/src/com/haulmont/cuba/gui/xml/layout/loaders/RuntimePropertiesFrameLoader.java

@@ -28,7 +28,7 @@ import java.io.InputStream;
  */
 public class RuntimePropertiesFrameLoader extends IFrameLoader {
 
-    private static final String DEFAULT_DESCRIPTOR = "/com/haulmont/cuba/gui/runtimeprops/runtime-properties-frame.xml";
+    private static final String DEFAULT_DESCRIPTOR = "/com/haulmont/cuba/gui/app/core/dynamicattributes/runtime-properties-frame.xml";
 
     public RuntimePropertiesFrameLoader(Context context, LayoutLoaderConfig config, ComponentsFactory factory) {
         super(context, config, factory);

modules/gui/src/cuba-gui-metadata.xml

@@ -26,7 +26,7 @@
         <class>com.haulmont.cuba.gui.components.filter.descriptor.CustomConditionCreator</class>
         <class>com.haulmont.cuba.gui.components.filter.descriptor.DynamicAttributesConditionCreator</class>
         <class>com.haulmont.cuba.gui.components.filter.descriptor.HeaderConditionDescriptor</class>
-        <class>com.haulmont.cuba.gui.categories.ScreenAndComponent</class>
+        <class>com.haulmont.cuba.gui.app.core.categories.ScreenAndComponent</class>
     </metadata-model>
 
 </metadata>