Author: max.andersen(a)jboss.com Date: 2007-10-19 06:44:14 -0400 (Fri, 19 Oct 2007) New Revision: 4376 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/ModuleViewProvider.java Log: sub modules are now rendered correctly in properties + name property added for consistency Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2007-10-19 10:42:53 UTC (rev 4375) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2007-10-19 10:44:14 UTC (rev 4376) @@ -66,6 +66,7 @@ public static String ModulePropertyType; public static String ModulePropertyProject; public static String ModulePropertyModuleFactory; + public static String ModulePropertyName; public static String RefreshViewerAction; public static String DisableCategoryAction; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2007-10-19 10:42:53 UTC (rev 4375) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2007-10-19 10:44:14 UTC (rev 4376) @@ -54,9 +54,10 @@ ServerDialogHeading=JBoss Server #View's Module extension -ModulePropertyType=Module's Type -ModulePropertyProject=Module's Project -ModulePropertyModuleFactory=Module's Factory +ModulePropertyType=Type +ModulePropertyProject=Project +ModulePropertyModuleFactory=Factory +ModulePropertyName=Name DeleteModuleText=Remove FullPublishModuleText=Full Publish IncrementalPublishModuleText=Incremental Publish Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/ModuleViewProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/ModuleViewProvider.java 2007-10-19 10:42:53 UTC (rev 4375) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/ModuleViewProvider.java 2007-10-19 10:44:14 UTC (rev 4376) @@ -265,16 +265,18 @@ public String[] getPropertyKeys(Object selected) { - return new String[] { Messages.ModulePropertyType, Messages.ModulePropertyProject }; + return new String[] { Messages.ModulePropertyType, Messages.ModulePropertyProject, Messages.ModulePropertyName }; } public Properties getProperties(Object selected) { Properties props = new Properties(); if( selected != null && selected instanceof ModuleServer) { - IModule mod = ((ModuleServer)selected).module[0]; + ModuleServer moduleServer = ((ModuleServer)selected); + IModule mod = moduleServer.module[moduleServer.module.length-1]; if( mod != null && mod.getProject() != null ) { props.setProperty(Messages.ModulePropertyType, mod.getModuleType().getId()); props.setProperty(Messages.ModulePropertyProject, mod.getProject().getName()); + props.setProperty(Messages.ModulePropertyProject, mod.getName()); } } return props;