Fix environment editor

[gpl/argeo-slc.git] / plugins / org.argeo.slc.akb.ui / src / main / java / org / argeo / slc / akb / ui / editors / AbstractAkbNodeEditor.java

diff --git a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/editors/AbstractAkbNodeEditor.java b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/editors/AbstractAkbNodeEditor.java
index b8840c5cf7ff4b5a75e5a3fe144b2ba43af876d0..d77ed1249945623c555035d5cddbf23f706e988f 100644 (file)
--- a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/editors/AbstractAkbNodeEditor.java
+++ b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/editors/AbstractAkbNodeEditor.java
@@ -85,8 +85,12 @@ public abstract class AbstractAkbNodeEditor extends FormEditor {
 
                // Tooltip
                if (AkbJcrUtils.isEmptyString(name))
-                       name = "current item";
-               setTitleToolTip("Display and edit " + name);
+                       name = "current akb object";
+               if (isTemplate) {
+                       setTitleToolTip("Display and edit " + name);
+               } else
+                       setTitleToolTip("Display " + name);
+
        }
 
        /** Overwrite to provide supplementary pages between main and history page */
@@ -98,7 +102,7 @@ public abstract class AbstractAkbNodeEditor extends FormEditor {
        @Override
        protected void addPages() {
                try {
-                       if (isTemplate)
+                       if (isTemplate || envNode.isNodeType(AkbTypes.AKB_ENV))
                                addPage(new ConnectorAliasPage(this, "mainPage", "Main"));
                        // Add AKB Type specific pages
                        addOtherPages();
@@ -109,6 +113,9 @@ public abstract class AbstractAkbNodeEditor extends FormEditor {
                } catch (PartInitException e) {
                        throw new AkbException("Unable to initialise pages for editor "
                                        + getEditorId(), e);
+               } catch (RepositoryException e) {
+                       throw new AkbException("Unable to initialise pages for editor "
+                                       + getEditorId(), e);
                }
        }