xml editor: title is now above buttons and shows resource name

fixes deegree#363
copierrj · Aug 8, 2014 · 7aa0e73 · 7aa0e73
1 parent 6639c98
commit 7aa0e73
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/...services/deegree-webservices/src/main/java/org/deegree/console/generic/XmlEditorBean.java b/...services/deegree-webservices/src/main/java/org/deegree/console/generic/XmlEditorBean.java
@@ -61,7 +61,10 @@
 import org.deegree.commons.xml.schema.SchemaValidator;
 import org.deegree.services.controller.OGCFrontController;
 import org.deegree.services.metadata.provider.OWSMetadataProviderProvider;
+import org.deegree.workspace.Resource;
+import org.deegree.workspace.ResourceManager;
 import org.deegree.workspace.ResourceMetadata;
+import org.deegree.workspace.ResourceProvider;
 import org.deegree.workspace.Workspace;
 import org.deegree.workspace.WorkspaceUtils;
 import org.deegree.workspace.standard.AbstractResourceProvider;
@@ -262,4 +265,22 @@ public String validate() {
         }
         return null;
     }
+
+    public String getTitle() throws ClassNotFoundException {
+        if ( fileName != null ) {
+            return fileName;
+        }
+
+        Workspace workspace = OGCFrontController.getServiceWorkspace().getNewWorkspace();
+        Class<?> cls = workspace.getModuleClassLoader().loadClass( resourceProviderClass );
+        ResourceMetadata<?> md = workspace.getResourceMetadata( (Class) cls, id );
+
+        for ( ResourceManager<? extends Resource> resourceManager : workspace.getResourceManagers() ) {
+            if ( resourceManager.getProviders().contains( md.getProvider() ) ) {
+                return resourceManager.getMetadata().getWorkspacePath() + "/" + id;
+            }
+        }        
+
+        return null;
+    }
 }
diff --git a/deegree-services/deegree-webservices/src/main/webapp/console/generic/xmleditor.xhtml b/deegree-services/deegree-webservices/src/main/webapp/console/generic/xmleditor.xhtml
@@ -24,9 +24,12 @@
       <h:outputScript library="codemirror" name="mode/xml/xml.js" />
 
       <h:form prependId="false" styleClass="form-main">
+      	<h:panelGroup id="xmleditor-title" layout="block">
+        	<h:outputText value="Editing XML resource: ${xmlEditorBean.title}" />
+        </h:panelGroup>
+
         <h:panelGroup id="xmleditor" layout="block">
-          <h:panelGroup id="xmleditor-actions" layout="block">
-            <h:outputText value="Editing XML resource: ${xmlEditorBean.id} (${xmlEditorBean.resourceProviderClass})" />
+          <h:panelGroup id="xmleditor-actions" layout="block">            
             <h:commandButton styleClass="buttonSave" value="#{labels.xmlEditor_save}" onclick="save()"
               action="${xmlEditorBean.save}" />
             <h:commandButton styleClass="buttonCancel" value="#{labels.xmlEditor_cancel}"
@@ -35,8 +38,8 @@
               action="${xmlEditorBean.validate}">
               <f:ajax execute="xmltextarea" />
             </h:commandButton>
-            <h:commandButton styleClass="button" value="Toggle fullscreen" onclick="toggleFullscreen(); return false" />
-          </h:panelGroup>
+            <h:commandButton styleClass="button" value="Toggle fullscreen" onclick="toggleFullscreen(); return false" />            
+          </h:panelGroup>          
           <h:panelGroup id="xmleditor-input" layout="block">
             <h:inputTextarea id="xmltextarea" cols="30" rows="10" value="${xmlEditorBean.content}" />
           </h:panelGroup>