diff --git a/com.hazard157.prisex24/fragment.e4xmi b/com.hazard157.prisex24/fragment.e4xmi
index 3972e22..860d94c 100644
--- a/com.hazard157.prisex24/fragment.e4xmi
+++ b/com.hazard157.prisex24/fragment.e4xmi
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/com.hazard157.psx24.catnote/META-INF/MANIFEST.MF b/com.hazard157.psx24.catnote/META-INF/MANIFEST.MF
index cbacab5..4759b2e 100644
--- a/com.hazard157.psx24.catnote/META-INF/MANIFEST.MF
+++ b/com.hazard157.psx24.catnote/META-INF/MANIFEST.MF
@@ -21,7 +21,9 @@ Require-Bundle: javax.annotation,
org.toxsoft.core.txtproj.lib,
com.hazard157.lib.core,
com.hazard157.psx.proj3,
- com.hazard157.psx24.core
+ com.hazard157.psx24.core,
+ com.hazard157.common,
+ com.hazard157.psx.common
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: com.hazard157.psx24.catnote
Bundle-ActivationPolicy: lazy
@@ -29,8 +31,5 @@ Export-Package: com.hazard157.psx24.catnote,
com.hazard157.psx24.catnote.e4.addons,
com.hazard157.psx24.catnote.e4.uiparts,
com.hazard157.psx24.catnote.m5,
- com.hazard157.psx24.catnote.m5.category,
- com.hazard157.psx24.catnote.m5.note,
- com.hazard157.psx24.catnote.m5.notekind,
com.hazard157.psx24.catnote.main,
com.hazard157.psx24.catnote.main.impl
diff --git a/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/e4/addons/AddonPsx24Catnote.java b/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/e4/addons/AddonPsx24Catnote.java
index ef959ae..1c06228 100644
--- a/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/e4/addons/AddonPsx24Catnote.java
+++ b/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/e4/addons/AddonPsx24Catnote.java
@@ -8,9 +8,7 @@
import org.toxsoft.core.txtproj.lib.*;
import com.hazard157.psx24.catnote.*;
-import com.hazard157.psx24.catnote.m5.category.*;
-import com.hazard157.psx24.catnote.m5.note.*;
-import com.hazard157.psx24.catnote.m5.notekind.*;
+import com.hazard157.psx24.catnote.m5.*;
import com.hazard157.psx24.catnote.main.*;
import com.hazard157.psx24.catnote.main.impl.*;
diff --git a/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/IPsxResources.java b/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/IPsxResources.java
new file mode 100644
index 0000000..335944f
--- /dev/null
+++ b/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/IPsxResources.java
@@ -0,0 +1,21 @@
+package com.hazard157.psx24.catnote.m5;
+
+/**
+ * Localaizable resources.
+ *
+ * @author hazard157
+ */
+@SuppressWarnings( "nls" )
+interface IPsxResources {
+
+ String STR_M5M_CATEGORY = "Category";
+ String STR_M5M_CATEGORY_D = "Note category";
+
+ String STR_M5M_NOTE = "Note";
+ String STR_M5M_NOTE_D = "Categorized note of specified kind";
+ String STR_NOTE_KIND = "Kind";
+ String STR_NOTE_KIND_D = "The note kind";
+ String STR_NOTE_CATEGORY = "Category";
+ String STR_NOTE_CATEGORY_D = "The note category";
+
+}
diff --git a/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/category/NbCategoryM5LifecycleManager.java b/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/NbCategoryM5LifecycleManager.java
similarity index 98%
rename from com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/category/NbCategoryM5LifecycleManager.java
rename to com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/NbCategoryM5LifecycleManager.java
index 03a558e..db68568 100644
--- a/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/category/NbCategoryM5LifecycleManager.java
+++ b/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/NbCategoryM5LifecycleManager.java
@@ -1,4 +1,4 @@
-package com.hazard157.psx24.catnote.m5.category;
+package com.hazard157.psx24.catnote.m5;
import static org.toxsoft.core.tsgui.m5.IM5Constants.*;
import static org.toxsoft.core.tslib.av.metainfo.IAvMetaConstants.*;
diff --git a/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/category/NbCategoryM5Model.java b/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/NbCategoryM5Model.java
similarity index 87%
rename from com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/category/NbCategoryM5Model.java
rename to com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/NbCategoryM5Model.java
index cc927ec..f428ac3 100644
--- a/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/category/NbCategoryM5Model.java
+++ b/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/NbCategoryM5Model.java
@@ -1,7 +1,7 @@
-package com.hazard157.psx24.catnote.m5.category;
+package com.hazard157.psx24.catnote.m5;
import static com.hazard157.psx24.catnote.m5.INbNotebookM5Constants.*;
-import static com.hazard157.psx24.catnote.m5.category.IPsxResources.*;
+import static com.hazard157.psx24.catnote.m5.IPsxResources.*;
import org.toxsoft.core.tsgui.m5.model.*;
import org.toxsoft.core.tsgui.m5.model.impl.*;
@@ -30,7 +30,7 @@ public class NbCategoryM5Model
*/
public NbCategoryM5Model() {
super( MID_NB_CATEGORY, INbCategory.class );
- setNameAndDescription( STR_N_M5M_CATEGORY, STR_D_M5M_CATEGORY );
+ setNameAndDescription( STR_M5M_CATEGORY, STR_M5M_CATEGORY_D );
addFieldDefs( ID, NAME, DESCRIPTION );
}
diff --git a/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/note/NbNoteM5LifecycleManager.java b/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/NbNoteM5LifecycleManager.java
similarity index 98%
rename from com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/note/NbNoteM5LifecycleManager.java
rename to com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/NbNoteM5LifecycleManager.java
index 6d186d0..5fcc62b 100644
--- a/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/note/NbNoteM5LifecycleManager.java
+++ b/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/NbNoteM5LifecycleManager.java
@@ -1,4 +1,4 @@
-package com.hazard157.psx24.catnote.m5.note;
+package com.hazard157.psx24.catnote.m5;
import static com.hazard157.psx24.catnote.m5.INbNotebookM5Constants.*;
import static com.hazard157.psx24.catnote.main.INbNotebookConstants.*;
diff --git a/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/note/NbNoteM5Model.java b/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/NbNoteM5Model.java
similarity index 85%
rename from com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/note/NbNoteM5Model.java
rename to com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/NbNoteM5Model.java
index c62b25c..ccd9b8f 100644
--- a/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/note/NbNoteM5Model.java
+++ b/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/NbNoteM5Model.java
@@ -1,7 +1,7 @@
-package com.hazard157.psx24.catnote.m5.note;
+package com.hazard157.psx24.catnote.m5;
import static com.hazard157.psx24.catnote.m5.INbNotebookM5Constants.*;
-import static com.hazard157.psx24.catnote.m5.note.IPsxResources.*;
+import static com.hazard157.psx24.catnote.m5.IPsxResources.*;
import static org.toxsoft.core.tsgui.m5.IM5Constants.*;
import static org.toxsoft.core.tsgui.m5.gui.mpc.IMultiPaneComponentConstants.*;
import static org.toxsoft.core.tsgui.valed.api.IValedControlConstants.*;
@@ -18,6 +18,8 @@
import org.toxsoft.core.tslib.utils.*;
import org.toxsoft.core.tslib.utils.errors.*;
+import com.hazard157.common.quants.visumple.impl.*;
+import com.hazard157.psx.common.stuff.place.*;
import com.hazard157.psx24.catnote.main.*;
/**
@@ -47,7 +49,7 @@ protected void doInit() {
@Override
protected void doInit() {
- setNameAndDescription( STR_N_NOTE_KIND, STR_D_NOTE_KIND );
+ setNameAndDescription( STR_NOTE_KIND, STR_NOTE_KIND_D );
setFlags( M5FF_COLUMN );
setDefaultValue( ENbNoteKind.MISC );
}
@@ -63,7 +65,7 @@ protected ENbNoteKind doGetFieldValue( INbNote aEntity ) {
@Override
protected void doInit() {
- setNameAndDescription( STR_N_NOTE_CATEGORY, STR_D_NOTE_CATEGORY );
+ setNameAndDescription( STR_NOTE_CATEGORY, STR_NOTE_CATEGORY_D );
setFlags( M5FF_COLUMN );
// FIXME GOGA надо сделать каркас ValedM5LifecycleManagedEntityFieldEditor
// FIXME setEditorFactory();
@@ -81,13 +83,17 @@ protected String doGetFieldValueName( INbNote aEntity ) {
};
+ public final IM5AttributeFieldDef PLACE = new PsxPlaceM5FieldDef<>();
+
+ public final IM5AttributeFieldDef VISUMPLES = new VisumplesM5AttributeFieldDef<>();
+
/**
* Constructor.
*/
public NbNoteM5Model() {
super( MID_NB_NOTE, INbNote.class );
- setNameAndDescription( STR_N_M5M_NOTE, STR_D_M5M_NOTE );
- addFieldDefs( ID, KIND, CATEGORY_ID, NAME, DESCRIPTION );
+ setNameAndDescription( STR_M5M_NOTE, STR_M5M_NOTE_D );
+ addFieldDefs( ID, KIND, CATEGORY_ID, NAME, PLACE, DESCRIPTION, VISUMPLES );
setPanelCreator( new M5DefaultPanelCreator<>() {
protected IM5CollectionPanel doCreateCollEditPanel( ITsGuiContext aContext,
diff --git a/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/notekind/NoteKindM5Model.java b/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/NoteKindM5Model.java
similarity index 89%
rename from com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/notekind/NoteKindM5Model.java
rename to com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/NoteKindM5Model.java
index a630ade..51b04cc 100644
--- a/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/notekind/NoteKindM5Model.java
+++ b/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/NoteKindM5Model.java
@@ -1,4 +1,4 @@
-package com.hazard157.psx24.catnote.m5.notekind;
+package com.hazard157.psx24.catnote.m5;
import static com.hazard157.psx24.catnote.m5.INbNotebookM5Constants.*;
diff --git a/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/category/IPsxResources.java b/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/category/IPsxResources.java
deleted file mode 100644
index 4975dfb..0000000
--- a/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/category/IPsxResources.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.hazard157.psx24.catnote.m5.category;
-
-/**
- * Localaizable resources.
- *
- * @author hazard157
- */
-@SuppressWarnings( "nls" )
-interface IPsxResources {
-
- String STR_N_M5M_CATEGORY = "Category";
- String STR_D_M5M_CATEGORY = "Note category";
-
-}
diff --git a/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/note/IPsxResources.java b/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/note/IPsxResources.java
deleted file mode 100644
index 7a9b9a3..0000000
--- a/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/m5/note/IPsxResources.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.hazard157.psx24.catnote.m5.note;
-
-/**
- * Localaizable resources.
- *
- * @author hazard157
- */
-@SuppressWarnings( "nls" )
-interface IPsxResources {
-
- String STR_N_M5M_NOTE = "Note";
- String STR_D_M5M_NOTE = "Categorized note of specified kind";
- String STR_N_NOTE_KIND = "Kind";
- String STR_D_NOTE_KIND = "The note kind";
- String STR_N_NOTE_CATEGORY = "Category";
- String STR_D_NOTE_CATEGORY = "The note category";
-
-}
diff --git a/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/main/INbNote.java b/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/main/INbNote.java
index 603e167..7f44255 100644
--- a/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/main/INbNote.java
+++ b/com.hazard157.psx24.catnote/src/com/hazard157/psx24/catnote/main/INbNote.java
@@ -2,13 +2,16 @@
import org.toxsoft.core.tslib.bricks.strid.*;
+import com.hazard157.common.quants.visumple.*;
+import com.hazard157.psx.common.stuff.place.*;
+
/**
* Notebook note.
*
* @author hazard157
*/
public interface INbNote
- extends IStridableParameterized {
+ extends IStridableParameterized, IParamsVisumplable, IParamsPlaceable {
/**
* Returns the note kind.
diff --git a/com.hazard157.psx24.exe/fragment.e4xmi b/com.hazard157.psx24.exe/fragment.e4xmi
index 6107b36..641ef27 100644
--- a/com.hazard157.psx24.exe/fragment.e4xmi
+++ b/com.hazard157.psx24.exe/fragment.e4xmi
@@ -6,7 +6,7 @@
-
-
+
+