diff --git a/drools-wb-screens/drools-wb-categories-editor/drools-wb-categories-editor-client/src/main/java/org/drools/workbench/screens/categories/client/CategoriesEditorPresenter.java b/drools-wb-screens/drools-wb-categories-editor/drools-wb-categories-editor-client/src/main/java/org/drools/workbench/screens/categories/client/CategoriesEditorPresenter.java index d1501ab1809..07b1cdf364e 100644 --- a/drools-wb-screens/drools-wb-categories-editor/drools-wb-categories-editor-client/src/main/java/org/drools/workbench/screens/categories/client/CategoriesEditorPresenter.java +++ b/drools-wb-screens/drools-wb-categories-editor/drools-wb-categories-editor-client/src/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/drools-wb-screens/drools-wb-drl-text-editor/drools-wb-drl-text-editor-client/src/main/java/org/drools/workbench/screens/drltext/client/editor/DRLEditorPresenter.java b/drools-wb-screens/drools-wb-drl-text-editor/drools-wb-drl-text-editor-client/src/main/java/org/drools/workbench/screens/drltext/client/editor/DRLEditorPresenter.java index 0d9e85d8921..b9953582f2f 100644 --- a/drools-wb-screens/drools-wb-drl-text-editor/drools-wb-drl-text-editor-client/src/main/java/org/drools/workbench/screens/drltext/client/editor/DRLEditorPresenter.java +++ b/drools-wb-screens/drools-wb-drl-text-editor/drools-wb-drl-text-editor-client/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/drools-wb-screens/drools-wb-dsl-text-editor/drools-wb-dsl-text-editor-client/src/main/java/org/drools/workbench/screens/dsltext/client/editor/DSLEditorPresenter.java b/drools-wb-screens/drools-wb-dsl-text-editor/drools-wb-dsl-text-editor-client/src/main/java/org/drools/workbench/screens/dsltext/client/editor/DSLEditorPresenter.java index ffbddd5faa7..a7695c3af88 100644 --- a/drools-wb-screens/drools-wb-dsl-text-editor/drools-wb-dsl-text-editor-client/src/main/java/org/drools/workbench/screens/dsltext/client/editor/DSLEditorPresenter.java +++ b/drools-wb-screens/drools-wb-dsl-text-editor/drools-wb-dsl-text-editor-client/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/drools-wb-screens/drools-wb-dtable-xls-editor/drools-wb-dtable-xls-editor-client/src/main/java/org/drools/workbench/screens/dtablexls/client/editor/DecisionTableXLSEditorPresenter.java b/drools-wb-screens/drools-wb-dtable-xls-editor/drools-wb-dtable-xls-editor-client/src/main/java/org/drools/workbench/screens/dtablexls/client/editor/DecisionTableXLSEditorPresenter.java index 1b53a249875..f0c3b0f0af8 100644 --- a/drools-wb-screens/drools-wb-dtable-xls-editor/drools-wb-dtable-xls-editor-client/src/main/java/org/drools/workbench/screens/dtablexls/client/editor/DecisionTableXLSEditorPresenter.java +++ b/drools-wb-screens/drools-wb-dtable-xls-editor/drools-wb-dtable-xls-editor-client/src/main/java/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/drools-wb-screens/drools-wb-enum-editor/drools-wb-enum-editor-client/src/main/java/org/drools/workbench/screens/enums/client/editor/EnumEditorPresenter.java b/drools-wb-screens/drools-wb-enum-editor/drools-wb-enum-editor-client/src/main/java/org/drools/workbench/screens/enums/client/editor/EnumEditorPresenter.java index b93f0bd4b84..e5b010daa6e 100644 --- a/drools-wb-screens/drools-wb-enum-editor/drools-wb-enum-editor-client/src/main/java/org/drools/workbench/screens/enums/client/editor/EnumEditorPresenter.java +++ b/drools-wb-screens/drools-wb-enum-editor/drools-wb-enum-editor-client/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; + @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/drools-wb-screens/drools-wb-globals-editor/drools-wb-globals-editor-client/src/main/java/org/drools/workbench/screens/globals/client/editor/GlobalsEditorPresenter.java b/drools-wb-screens/drools-wb-globals-editor/drools-wb-globals-editor-client/src/main/java/org/drools/workbench/screens/globals/client/editor/GlobalsEditorPresenter.java index 9764a2d21b2..807f3d3d4e5 100644 --- a/drools-wb-screens/drools-wb-globals-editor/drools-wb-globals-editor-client/src/main/java/org/drools/workbench/screens/globals/client/editor/GlobalsEditorPresenter.java +++ b/drools-wb-screens/drools-wb-globals-editor/drools-wb-globals-editor-client/src/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/drools-wb-screens/drools-wb-guided-dtable-editor/drools-wb-guided-dtable-editor-client/src/main/java/org/drools/workbench/screens/guided/dtable/client/editor/GuidedDecisionTableEditorPresenter.java b/drools-wb-screens/drools-wb-guided-dtable-editor/drools-wb-guided-dtable-editor-client/src/main/java/org/drools/workbench/screens/guided/dtable/client/editor/GuidedDecisionTableEditorPresenter.java index d54a8fdc4e3..94d561d1049 100644 --- a/drools-wb-screens/drools-wb-guided-dtable-editor/drools-wb-guided-dtable-editor-client/src/main/java/org/drools/workbench/screens/guided/dtable/client/editor/GuidedDecisionTableEditorPresenter.java +++ b/drools-wb-screens/drools-wb-guided-dtable-editor/drools-wb-guided-dtable-editor-client/src/main/java/org/drools/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; + @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/drools-wb-screens/drools-wb-guided-rule-editor/drools-wb-guided-rule-editor-client/src/main/java/org/drools/workbench/screens/guided/rule/client/editor/GuidedRuleEditorPresenter.java b/drools-wb-screens/drools-wb-guided-rule-editor/drools-wb-guided-rule-editor-client/src/main/java/org/drools/workbench/screens/guided/rule/client/editor/GuidedRuleEditorPresenter.java index b61c6933f1a..9ad7d59d731 100644 --- a/drools-wb-screens/drools-wb-guided-rule-editor/drools-wb-guided-rule-editor-client/src/main/java/org/drools/workbench/screens/guided/rule/client/editor/GuidedRuleEditorPresenter.java +++ b/drools-wb-screens/drools-wb-guided-rule-editor/drools-wb-guided-rule-editor-client/src/main/java/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; + @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/drools-wb-screens/drools-wb-guided-scorecard-editor/drools-wb-guided-scorecard-editor-client/src/main/java/org/drools/workbench/screens/guided/scorecard/client/editor/GuidedScoreCardEditorPresenter.java b/drools-wb-screens/drools-wb-guided-scorecard-editor/drools-wb-guided-scorecard-editor-client/src/main/java/org/drools/workbench/screens/guided/scorecard/client/editor/GuidedScoreCardEditorPresenter.java index 0856d44e555..6452a4860c8 100644 --- a/drools-wb-screens/drools-wb-guided-scorecard-editor/drools-wb-guided-scorecard-editor-client/src/main/java/org/drools/workbench/screens/guided/scorecard/client/editor/GuidedScoreCardEditorPresenter.java +++ b/drools-wb-screens/drools-wb-guided-scorecard-editor/drools-wb-guided-scorecard-editor-client/src/main/java/org/drools/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/drools-wb-screens/drools-wb-guided-template-editor/drools-wb-guided-template-editor-client/src/main/java/org/drools/workbench/screens/guided/template/client/editor/GuidedRuleTemplateEditorPresenter.java b/drools-wb-screens/drools-wb-guided-template-editor/drools-wb-guided-template-editor-client/src/main/java/org/drools/workbench/screens/guided/template/client/editor/GuidedRuleTemplateEditorPresenter.java index 6e8cdb2df60..dc5e1b5648b 100644 --- a/drools-wb-screens/drools-wb-guided-template-editor/drools-wb-guided-template-editor-client/src/main/java/org/drools/workbench/screens/guided/template/client/editor/GuidedRuleTemplateEditorPresenter.java +++ b/drools-wb-screens/drools-wb-guided-template-editor/drools-wb-guided-template-editor-client/src/main/java/org/drools/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; + @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/drools-wb-screens/drools-wb-scorecard-xls-editor/drools-wb-scorecard-xls-editor-client/src/main/java/org/drools/workbench/screens/scorecardxls/client/editor/ScoreCardXLSEditorPresenter.java b/drools-wb-screens/drools-wb-scorecard-xls-editor/drools-wb-scorecard-xls-editor-client/src/main/java/org/drools/workbench/screens/scorecardxls/client/editor/ScoreCardXLSEditorPresenter.java index 8970dc8e012..b89a7990c47 100644 --- a/drools-wb-screens/drools-wb-scorecard-xls-editor/drools-wb-scorecard-xls-editor-client/src/main/java/org/drools/workbench/screens/scorecardxls/client/editor/ScoreCardXLSEditorPresenter.java +++ b/drools-wb-screens/drools-wb-scorecard-xls-editor/drools-wb-scorecard-xls-editor-client/src/main/java/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 diff --git a/drools-wb-screens/drools-wb-test-scenario-editor/drools-wb-test-scenario-editor-client/src/main/java/org/drools/workbench/screens/testscenario/client/ScenarioEditorPresenter.java b/drools-wb-screens/drools-wb-test-scenario-editor/drools-wb-test-scenario-editor-client/src/main/java/org/drools/workbench/screens/testscenario/client/ScenarioEditorPresenter.java index eca4fd32948..ca9e19da591 100644 --- a/drools-wb-screens/drools-wb-test-scenario-editor/drools-wb-test-scenario-editor-client/src/main/java/org/drools/workbench/screens/testscenario/client/ScenarioEditorPresenter.java +++ b/drools-wb-screens/drools-wb-test-scenario-editor/drools-wb-test-scenario-editor-client/src/main/java/org/drools/workbench/screens/testscenario/client/ScenarioEditorPresenter.java @@ -45,8 +45,8 @@ import org.uberfire.mvp.Command; import org.uberfire.mvp.ParameterizedCommand; import org.uberfire.mvp.PlaceRequest; -import org.uberfire.util.FileNameUtil; import org.uberfire.workbench.model.menu.Menus; +import org.uberfire.workbench.type.FileNameUtil; import static org.uberfire.client.common.ConcurrentChangePopup.*; @@ -58,6 +58,7 @@ public class ScenarioEditorPresenter { private final Caller service; private final PlaceManager placeManager; private final Event changeTitleNotification; + private final TestScenarioResourceType type; private Menus menus; protected PackageDataModelOracle dmo; @@ -74,12 +75,14 @@ public ScenarioEditorPresenter( final @New ScenarioEditorView view, final @New FileMenuBuilder menuBuilder, final Caller service, final PlaceManager placeManager, - final Event changeTitleNotification ) { + final Event changeTitleNotification, + final TestScenarioResourceType type ) { this.view = view; this.menuBuilder = menuBuilder; this.service = service; this.placeManager = placeManager; this.changeTitleNotification = changeTitleNotification; + this.type = type; } @OnStartup @@ -242,7 +245,8 @@ public void callback( final Path path ) { @WorkbenchPartTitle public String getTitle() { - return view.getTitle( FileNameUtil.removeExtension(path.getFileName()) ); + return view.getTitle( FileNameUtil.removeExtension( path, + type ) ); } @WorkbenchPartView diff --git a/drools-wb-screens/drools-wb-workitems-editor/drools-wb-workitems-editor-client/src/main/java/org/drools/workbench/screens/workitems/client/editor/WorkItemsEditorPresenter.java b/drools-wb-screens/drools-wb-workitems-editor/drools-wb-workitems-editor-client/src/main/java/org/drools/workbench/screens/workitems/client/editor/WorkItemsEditorPresenter.java index 5ac52b5a177..78b4b383b09 100644 --- a/drools-wb-screens/drools-wb-workitems-editor/drools-wb-workitems-editor-client/src/main/java/org/drools/workbench/screens/workitems/client/editor/WorkItemsEditorPresenter.java +++ b/drools-wb-screens/drools-wb-workitems-editor/drools-wb-workitems-editor-client/src/main/java/org/drools/workbench/screens/workitems/client/editor/WorkItemsEditorPresenter.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 WorkItemsEditorPresenter { @Inject private MultiPageEditor multiPage; + @Inject + private WorkItemsResourceType type; + @Inject @New private FileMenuBuilder menuBuilder; @@ -320,7 +323,8 @@ public boolean checkIfDirty() { @WorkbenchPartTitle public String getTitle() { - return WorkItemsEditorConstants.INSTANCE.Title() + " [" + FileNameUtil.removeExtension(path.getFileName()) + "]"; + return WorkItemsEditorConstants.INSTANCE.Title() + " [" + FileNameUtil.removeExtension( path, + type ) + "]"; } @WorkbenchPartView