More BZ1007781 - Editors should not contain file extension of assets

(cherry picked from commit dcaf3ea)
kiegroup · Sep 20, 2013 · e321a2a · e321a2a
1 parent 4f6f182
commit e321a2a
Show file tree

Hide file tree

Showing 13 changed files with 96 additions and 36 deletions.
diff --git a/...c/main/java/org/drools/workbench/screens/categories/client/CategoriesEditorPresenter.java b/...c/main/java/org/drools/workbench/screens/categories/client/CategoriesEditorPresenter.java
@@ -24,27 +24,27 @@
 import org.drools.workbench.screens.categories.client.type.CategoryDefinitionResourceType;
 import org.guvnor.common.services.shared.metadata.CategoriesService;
 import org.guvnor.common.services.shared.metadata.model.Categories;
-import org.jboss.errai.common.client.api.RemoteCallback;
 import org.jboss.errai.common.client.api.Caller;
+import org.jboss.errai.common.client.api.RemoteCallback;
 import org.kie.workbench.common.widgets.client.callbacks.HasBusyIndicatorDefaultErrorCallback;
 import org.kie.workbench.common.widgets.client.menu.FileMenuBuilder;
 import org.kie.workbench.common.widgets.client.popups.file.CommandWithCommitMessage;
 import org.kie.workbench.common.widgets.client.popups.file.SaveOperationService;
 import org.kie.workbench.common.widgets.client.resources.i18n.CommonConstants;
 import org.uberfire.backend.vfs.Path;
+import org.uberfire.client.annotations.WorkbenchEditor;
+import org.uberfire.client.annotations.WorkbenchMenu;
+import org.uberfire.client.annotations.WorkbenchPartTitle;
+import org.uberfire.client.annotations.WorkbenchPartView;
 import org.uberfire.lifecycle.IsDirty;
 import org.uberfire.lifecycle.OnClose;
 import org.uberfire.lifecycle.OnMayClose;
 import org.uberfire.lifecycle.OnSave;
 import org.uberfire.lifecycle.OnStartup;
-import org.uberfire.client.annotations.WorkbenchEditor;
-import org.uberfire.client.annotations.WorkbenchMenu;
-import org.uberfire.client.annotations.WorkbenchPartTitle;
-import org.uberfire.client.annotations.WorkbenchPartView;
 import org.uberfire.mvp.Command;
-import org.uberfire.util.FileNameUtil;
 import org.uberfire.workbench.events.NotificationEvent;
 import org.uberfire.workbench.model.menu.Menus;
+import org.uberfire.workbench.type.FileNameUtil;
 
 /**
  *
@@ -65,6 +65,9 @@ public class CategoriesEditorPresenter {
     @Inject
     private FileMenuBuilder menuBuilder;
 
+    @Inject
+    private CategoryDefinitionResourceType type;
+
     private Path path;
 
     private Menus menus;
@@ -108,7 +111,7 @@ public void execute( final String commitMessage ) {
                                                  view.showBusyIndicator( CommonConstants.INSTANCE.Saving() );
                                                  categoryService.call( getSaveSuccessCallback(),
                                                                        new HasBusyIndicatorDefaultErrorCallback( view ) ).save( path,
-                                                                                                                      view.getContent() );
+                                                                                                                                view.getContent() );
                                              }
                                          } );
     }
@@ -145,7 +148,8 @@ public boolean checkIfDirty() {
 
     @WorkbenchPartTitle
     public String getTitle() {
-        return "Categories Editor [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
+        return "Categories Editor [" + FileNameUtil.removeExtension( path,
+                                                                     type ) + "]";
     }
 
     @WorkbenchPartView

diff --git a/.../src/main/java/org/drools/workbench/screens/drltext/client/editor/DRLEditorPresenter.java b/.../src/main/java/org/drools/workbench/screens/drltext/client/editor/DRLEditorPresenter.java
@@ -60,9 +60,9 @@
 import org.uberfire.mvp.Command;
 import org.uberfire.mvp.ParameterizedCommand;
 import org.uberfire.mvp.PlaceRequest;
-import org.uberfire.util.FileNameUtil;
 import org.uberfire.workbench.events.NotificationEvent;
 import org.uberfire.workbench.model.menu.Menus;
+import org.uberfire.workbench.type.FileNameUtil;
 
 import static org.uberfire.client.common.ConcurrentChangePopup.*;
 
@@ -97,6 +97,9 @@ public class DRLEditorPresenter {
     @Inject
     private MultiPageEditor multiPage;
 
+    @Inject
+    private DRLResourceType type;
+
     @Inject
     @New
     private FileMenuBuilder menuBuilder;
@@ -354,7 +357,8 @@ public boolean checkIfDirty() {
 
     @WorkbenchPartTitle
     public String getTitle() {
-        return "DRL Editor [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
+        return "DRL Editor [" + FileNameUtil.removeExtension( path,
+                                                              type ) + "]";
     }
 
     @WorkbenchPartView

diff --git a/.../src/main/java/org/drools/workbench/screens/dsltext/client/editor/DSLEditorPresenter.java b/.../src/main/java/org/drools/workbench/screens/dsltext/client/editor/DSLEditorPresenter.java
@@ -58,9 +58,9 @@
 import org.uberfire.mvp.Command;
 import org.uberfire.mvp.ParameterizedCommand;
 import org.uberfire.mvp.PlaceRequest;
-import org.uberfire.util.FileNameUtil;
 import org.uberfire.workbench.events.NotificationEvent;
 import org.uberfire.workbench.model.menu.Menus;
+import org.uberfire.workbench.type.FileNameUtil;
 
 import static org.uberfire.client.common.ConcurrentChangePopup.*;
 
@@ -95,6 +95,9 @@ public class DSLEditorPresenter {
     @Inject
     private MultiPageEditor multiPage;
 
+    @Inject
+    private DSLResourceType type;
+
     @Inject
     @New
     private FileMenuBuilder menuBuilder;
@@ -316,7 +319,8 @@ public boolean checkIfDirty() {
 
     @WorkbenchPartTitle
     public String getTitle() {
-        return "DRL Editor [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
+        return "DRL Editor [" + FileNameUtil.removeExtension( path,
+                                                              type ) + "]";
     }
 
     @WorkbenchPartView

diff --git a/...org/drools/workbench/screens/dtablexls/client/editor/DecisionTableXLSEditorPresenter.java b/...org/drools/workbench/screens/dtablexls/client/editor/DecisionTableXLSEditorPresenter.java
@@ -55,9 +55,9 @@
 import org.uberfire.mvp.Command;
 import org.uberfire.mvp.ParameterizedCommand;
 import org.uberfire.mvp.PlaceRequest;
-import org.uberfire.util.FileNameUtil;
 import org.uberfire.workbench.events.NotificationEvent;
 import org.uberfire.workbench.model.menu.Menus;
+import org.uberfire.workbench.type.FileNameUtil;
 
 import static org.uberfire.client.common.ConcurrentChangePopup.*;
 
@@ -92,6 +92,9 @@ public class DecisionTableXLSEditorPresenter {
     @Inject
     private BusyIndicatorView busyIndicatorView;
 
+    @Inject
+    private DecisionTableXLSResourceType type;
+
     @Inject
     @New
     private FileMenuBuilder menuBuilder;
@@ -249,7 +252,8 @@ public void onClose() {
 
     @WorkbenchPartTitle
     public String getTitle() {
-        return "XLS Decision Table Editor [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
+        return "XLS Decision Table Editor [" + FileNameUtil.removeExtension( path,
+                                                                             type ) + "]";
     }
 
     @WorkbenchPartView

diff --git a/...t/src/main/java/org/drools/workbench/screens/enums/client/editor/EnumEditorPresenter.java b/...t/src/main/java/org/drools/workbench/screens/enums/client/editor/EnumEditorPresenter.java
@@ -59,9 +59,9 @@
 import org.uberfire.mvp.Command;
 import org.uberfire.mvp.ParameterizedCommand;
 import org.uberfire.mvp.PlaceRequest;
-import org.uberfire.util.FileNameUtil;
 import org.uberfire.workbench.events.NotificationEvent;
 import org.uberfire.workbench.model.menu.Menus;
+import org.uberfire.workbench.type.FileNameUtil;
 
 import static org.uberfire.client.common.ConcurrentChangePopup.*;
 
@@ -96,6 +96,9 @@ public class EnumEditorPresenter {
     @Inject
     private Caller<MetadataService> metadataService;
 
+    @Inject
+    private EnumResourceType type;
+
     @Inject
     @New
     private FileMenuBuilder menuBuilder;
@@ -333,7 +336,8 @@ public boolean checkIfDirty() {
 
     @WorkbenchPartTitle
     public String getTitle() {
-        return "Enum Editor [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
+        return "Enum Editor [" + FileNameUtil.removeExtension( path,
+                                                               type ) + "]";
     }
 
     @WorkbenchPartView

diff --git a/.../main/java/org/drools/workbench/screens/globals/client/editor/GlobalsEditorPresenter.java b/.../main/java/org/drools/workbench/screens/globals/client/editor/GlobalsEditorPresenter.java
@@ -47,9 +47,9 @@
 import org.uberfire.mvp.Command;
 import org.uberfire.mvp.ParameterizedCommand;
 import org.uberfire.mvp.PlaceRequest;
-import org.uberfire.util.FileNameUtil;
 import org.uberfire.workbench.events.NotificationEvent;
 import org.uberfire.workbench.model.menu.Menus;
+import org.uberfire.workbench.type.FileNameUtil;
 
 import static org.uberfire.client.common.ConcurrentChangePopup.*;
 
@@ -92,6 +92,9 @@ public class GlobalsEditorPresenter {
     @Inject
     private PlaceManager placeManager;
 
+    @Inject
+    private GlobalResourceType type;
+
     @Inject
     @New
     private FileMenuBuilder menuBuilder;
@@ -347,10 +350,12 @@ public boolean checkIfDirty() {
 
     @WorkbenchPartTitle
     public String getTitle() {
+        final String fileName = FileNameUtil.removeExtension( path,
+                                                              type );
         if ( isReadOnly ) {
-            return GlobalsEditorConstants.INSTANCE.globalsEditorReadOnlyTitle0( FileNameUtil.removeExtension(path.getFileName()) );
+            return GlobalsEditorConstants.INSTANCE.globalsEditorReadOnlyTitle0( fileName );
         }
-        return GlobalsEditorConstants.INSTANCE.globalsEditorTitle0( FileNameUtil.removeExtension(path.getFileName()) );
+        return GlobalsEditorConstants.INSTANCE.globalsEditorTitle0( fileName );
     }
 
     @WorkbenchMenu

diff --git a/...ols/workbench/screens/guided/dtable/client/editor/GuidedDecisionTableEditorPresenter.java b/...ols/workbench/screens/guided/dtable/client/editor/GuidedDecisionTableEditorPresenter.java
@@ -63,9 +63,9 @@
 import org.uberfire.mvp.Command;
 import org.uberfire.mvp.ParameterizedCommand;
 import org.uberfire.mvp.PlaceRequest;
-import org.uberfire.util.FileNameUtil;
 import org.uberfire.workbench.events.NotificationEvent;
 import org.uberfire.workbench.model.menu.Menus;
+import org.uberfire.workbench.type.FileNameUtil;
 
 import static org.uberfire.client.common.ConcurrentChangePopup.*;
 
@@ -104,6 +104,9 @@ public class GuidedDecisionTableEditorPresenter {
     @Inject
     private Caller<MetadataService> metadataService;
 
+    @Inject
+    private GuidedDTableResourceType type;
+
     @Inject
     @New
     private FileMenuBuilder menuBuilder;
@@ -362,7 +365,8 @@ public boolean checkIfDirty() {
 
     @WorkbenchPartTitle
     public String getTitle() {
-        return "Guided Decision Table [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
+        return "Guided Decision Table [" + FileNameUtil.removeExtension( path,
+                                                                         type ) + "]";
     }
 
     @WorkbenchPartView

diff --git a/...ava/org/drools/workbench/screens/guided/rule/client/editor/GuidedRuleEditorPresenter.java b/...ava/org/drools/workbench/screens/guided/rule/client/editor/GuidedRuleEditorPresenter.java
@@ -66,9 +66,9 @@
 import org.uberfire.mvp.Command;
 import org.uberfire.mvp.ParameterizedCommand;
 import org.uberfire.mvp.PlaceRequest;
-import org.uberfire.util.FileNameUtil;
 import org.uberfire.workbench.events.NotificationEvent;
 import org.uberfire.workbench.model.menu.Menus;
+import org.uberfire.workbench.type.FileNameUtil;
 
 import static org.uberfire.client.common.ConcurrentChangePopup.*;
 
@@ -103,6 +103,9 @@ public class GuidedRuleEditorPresenter {
     @Inject
     private Caller<MetadataService> metadataService;
 
+    @Inject
+    private GuidedRuleDRLResourceType resourceTypeDRL;
+
     @Inject
     private GuidedRuleDSLRResourceType resourceTypeDSL;
 
@@ -379,7 +382,14 @@ public boolean checkIfDirty() {
 
     @WorkbenchPartTitle
     public String getTitle() {
-        return "Guided Editor [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
+        if ( resourceTypeDRL.accept( path ) ) {
+            return "Guided Editor [" + FileNameUtil.removeExtension( path,
+                                                                     resourceTypeDRL ) + "]";
+        } else if ( resourceTypeDSL.accept( path ) ) {
+            return "Guided Editor [" + FileNameUtil.removeExtension( path,
+                                                                     resourceTypeDSL ) + "]";
+        }
+        return path.getFileName();
     }
 
     @WorkbenchPartView

diff --git a/...ools/workbench/screens/guided/scorecard/client/editor/GuidedScoreCardEditorPresenter.java b/...ools/workbench/screens/guided/scorecard/client/editor/GuidedScoreCardEditorPresenter.java
@@ -24,9 +24,9 @@
 import javax.inject.Inject;
 
 import com.google.gwt.user.client.ui.IsWidget;
+import org.drools.workbench.models.commons.shared.oracle.PackageDataModelOracle;
 import org.drools.workbench.models.datamodel.events.ImportAddedEvent;
 import org.drools.workbench.models.datamodel.events.ImportRemovedEvent;
-import org.drools.workbench.models.commons.shared.oracle.PackageDataModelOracle;
 import org.drools.workbench.models.guided.scorecard.shared.ScoreCardModel;
 import org.drools.workbench.screens.guided.scorecard.client.type.GuidedScoreCardResourceType;
 import org.drools.workbench.screens.guided.scorecard.model.ScoreCardModelContent;
@@ -65,9 +65,9 @@
 import org.uberfire.mvp.Command;
 import org.uberfire.mvp.ParameterizedCommand;
 import org.uberfire.mvp.PlaceRequest;
-import org.uberfire.util.FileNameUtil;
 import org.uberfire.workbench.events.NotificationEvent;
 import org.uberfire.workbench.model.menu.Menus;
+import org.uberfire.workbench.type.FileNameUtil;
 
 import static org.uberfire.client.common.ConcurrentChangePopup.*;
 
@@ -105,6 +105,9 @@ public class GuidedScoreCardEditorPresenter {
     @Inject
     private PlaceManager placeManager;
 
+    @Inject
+    private GuidedScoreCardResourceType type;
+
     @Inject
     @New
     private FileMenuBuilder menuBuilder;
@@ -382,10 +385,12 @@ public boolean checkIfDirty() {
 
     @WorkbenchPartTitle
     public String getTitle() {
+        final String fileName = FileNameUtil.removeExtension( path,
+                                                              type );
         if ( isReadOnly ) {
-            return "Read Only Score Card  Viewer [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
+            return "Read Only Score Card  Viewer [" + fileName + "]";
         }
-        return "Score Card Editor [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
+        return "Score Card Editor [" + fileName + "]";
     }
 
     @WorkbenchMenu

diff --git a/...ls/workbench/screens/guided/template/client/editor/GuidedRuleTemplateEditorPresenter.java b/...ls/workbench/screens/guided/template/client/editor/GuidedRuleTemplateEditorPresenter.java
@@ -69,9 +69,9 @@
 import org.uberfire.mvp.Command;
 import org.uberfire.mvp.ParameterizedCommand;
 import org.uberfire.mvp.PlaceRequest;
-import org.uberfire.util.FileNameUtil;
 import org.uberfire.workbench.events.NotificationEvent;
 import org.uberfire.workbench.model.menu.Menus;
+import org.uberfire.workbench.type.FileNameUtil;
 
 import static org.uberfire.client.common.ConcurrentChangePopup.*;
 
@@ -109,6 +109,9 @@ public class GuidedRuleTemplateEditorPresenter {
     @Inject
     private Caller<MetadataService> metadataService;
 
+    @Inject
+    private GuidedRuleTemplateResourceType type;
+
     @Inject
     @New
     private FileMenuBuilder menuBuilder;
@@ -400,7 +403,8 @@ public boolean checkIfDirty() {
 
     @WorkbenchPartTitle
     public String getTitle() {
-        return "Guided Template [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
+        return "Guided Template [" + FileNameUtil.removeExtension( path,
+                                                                   type ) + "]";
     }
 
     @WorkbenchPartView

diff --git a/.../org/drools/workbench/screens/scorecardxls/client/editor/ScoreCardXLSEditorPresenter.java b/.../org/drools/workbench/screens/scorecardxls/client/editor/ScoreCardXLSEditorPresenter.java
@@ -51,9 +51,9 @@
 import org.uberfire.mvp.Command;
 import org.uberfire.mvp.ParameterizedCommand;
 import org.uberfire.mvp.PlaceRequest;
-import org.uberfire.util.FileNameUtil;
 import org.uberfire.workbench.events.NotificationEvent;
 import org.uberfire.workbench.model.menu.Menus;
+import org.uberfire.workbench.type.FileNameUtil;
 
 import static org.uberfire.client.common.ConcurrentChangePopup.*;
 
@@ -88,6 +88,9 @@ public class ScoreCardXLSEditorPresenter {
     @Inject
     private BusyIndicatorView busyIndicatorView;
 
+    @Inject
+    private ScoreCardXLSResourceType type;
+
     @Inject
     @New
     private FileMenuBuilder menuBuilder;
@@ -237,7 +240,8 @@ public void onClose() {
 
     @WorkbenchPartTitle
     public String getTitle() {
-        return "XLS Score Card Editor [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
+        return "XLS Score Card Editor [" + FileNameUtil.removeExtension( path,
+                                                                         type ) + "]";
     }
 
     @WorkbenchPartView