Skip to content

Commit dcaf3ea

Browse files
manstismanstis
committed
More BZ1007781 - Editors should not contain file extension of assets
1 parent c0befbc commit dcaf3ea

File tree

13 files changed

+96
-36
lines changed
  • drools-wb-screens
    • drools-wb-categories-editor/drools-wb-categories-editor-client/src/main/java/org/drools/workbench/screens/categories/client
    • drools-wb-drl-text-editor/drools-wb-drl-text-editor-client/src/main/java/org/drools/workbench/screens/drltext/client/editor
    • drools-wb-dsl-text-editor/drools-wb-dsl-text-editor-client/src/main/java/org/drools/workbench/screens/dsltext/client/editor
    • drools-wb-dtable-xls-editor/drools-wb-dtable-xls-editor-client/src/main/java/org/drools/workbench/screens/dtablexls/client/editor
    • drools-wb-enum-editor/drools-wb-enum-editor-client/src/main/java/org/drools/workbench/screens/enums/client/editor
    • drools-wb-globals-editor/drools-wb-globals-editor-client/src/main/java/org/drools/workbench/screens/globals/client/editor
    • drools-wb-guided-dtable-editor/drools-wb-guided-dtable-editor-client/src/main/java/org/drools/workbench/screens/guided/dtable/client/editor
    • drools-wb-guided-rule-editor/drools-wb-guided-rule-editor-client/src/main/java/org/drools/workbench/screens/guided/rule/client/editor
    • drools-wb-guided-scorecard-editor/drools-wb-guided-scorecard-editor-client/src/main/java/org/drools/workbench/screens/guided/scorecard/client/editor
    • drools-wb-guided-template-editor/drools-wb-guided-template-editor-client/src/main/java/org/drools/workbench/screens/guided/template/client/editor
    • drools-wb-scorecard-xls-editor/drools-wb-scorecard-xls-editor-client/src/main/java/org/drools/workbench/screens/scorecardxls/client/editor
    • drools-wb-test-scenario-editor/drools-wb-test-scenario-editor-client/src/main/java/org/drools/workbench/screens/testscenario/client
    • drools-wb-workitems-editor/drools-wb-workitems-editor-client/src/main/java/org/drools/workbench/screens/workitems/client/editor

13 files changed

+96
-36
lines changed

‎drools-wb-screens/drools-wb-categories-editor/drools-wb-categories-editor-client/src/main/java/org/drools/workbench/screens/categories/client/CategoriesEditorPresenter.java‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,27 @@
2424
import org.drools.workbench.screens.categories.client.type.CategoryDefinitionResourceType;
2525
import org.guvnor.common.services.shared.metadata.CategoriesService;
2626
import org.guvnor.common.services.shared.metadata.model.Categories;
27-
import org.jboss.errai.common.client.api.RemoteCallback;
2827
import org.jboss.errai.common.client.api.Caller;
28+
import org.jboss.errai.common.client.api.RemoteCallback;
2929
import org.kie.workbench.common.widgets.client.callbacks.HasBusyIndicatorDefaultErrorCallback;
3030
import org.kie.workbench.common.widgets.client.menu.FileMenuBuilder;
3131
import org.kie.workbench.common.widgets.client.popups.file.CommandWithCommitMessage;
3232
import org.kie.workbench.common.widgets.client.popups.file.SaveOperationService;
3333
import org.kie.workbench.common.widgets.client.resources.i18n.CommonConstants;
3434
import org.uberfire.backend.vfs.Path;
35+
import org.uberfire.client.annotations.WorkbenchEditor;
36+
import org.uberfire.client.annotations.WorkbenchMenu;
37+
import org.uberfire.client.annotations.WorkbenchPartTitle;
38+
import org.uberfire.client.annotations.WorkbenchPartView;
3539
import org.uberfire.lifecycle.IsDirty;
3640
import org.uberfire.lifecycle.OnClose;
3741
import org.uberfire.lifecycle.OnMayClose;
3842
import org.uberfire.lifecycle.OnSave;
3943
import org.uberfire.lifecycle.OnStartup;
40-
import org.uberfire.client.annotations.WorkbenchEditor;
41-
import org.uberfire.client.annotations.WorkbenchMenu;
42-
import org.uberfire.client.annotations.WorkbenchPartTitle;
43-
import org.uberfire.client.annotations.WorkbenchPartView;
4444
import org.uberfire.mvp.Command;
45-
import org.uberfire.util.FileNameUtil;
4645
import org.uberfire.workbench.events.NotificationEvent;
4746
import org.uberfire.workbench.model.menu.Menus;
47+
import org.uberfire.workbench.type.FileNameUtil;
4848

4949
/**
5050
*
@@ -65,6 +65,9 @@ public class CategoriesEditorPresenter {
6565
@Inject
6666
private FileMenuBuilder menuBuilder;
6767

68+
@Inject
69+
private CategoryDefinitionResourceType type;
70+
6871
private Path path;
6972

7073
private Menus menus;
@@ -108,7 +111,7 @@ public void execute( final String commitMessage ) {
108111
view.showBusyIndicator( CommonConstants.INSTANCE.Saving() );
109112
categoryService.call( getSaveSuccessCallback(),
110113
new HasBusyIndicatorDefaultErrorCallback( view ) ).save( path,
111-
view.getContent() );
114+
view.getContent() );
112115
}
113116
} );
114117
}
@@ -145,7 +148,8 @@ public boolean checkIfDirty() {
145148

146149
@WorkbenchPartTitle
147150
public String getTitle() {
148-
return "Categories Editor [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
151+
return "Categories Editor [" + FileNameUtil.removeExtension( path,
152+
type ) + "]";
149153
}
150154

151155
@WorkbenchPartView

‎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‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@
6060
import org.uberfire.mvp.Command;
6161
import org.uberfire.mvp.ParameterizedCommand;
6262
import org.uberfire.mvp.PlaceRequest;
63-
import org.uberfire.util.FileNameUtil;
6463
import org.uberfire.workbench.events.NotificationEvent;
6564
import org.uberfire.workbench.model.menu.Menus;
65+
import org.uberfire.workbench.type.FileNameUtil;
6666

6767
import static org.uberfire.client.common.ConcurrentChangePopup.*;
6868

@@ -97,6 +97,9 @@ public class DRLEditorPresenter {
9797
@Inject
9898
private MultiPageEditor multiPage;
9999

100+
@Inject
101+
private DRLResourceType type;
102+
100103
@Inject
101104
@New
102105
private FileMenuBuilder menuBuilder;
@@ -354,7 +357,8 @@ public boolean checkIfDirty() {
354357

355358
@WorkbenchPartTitle
356359
public String getTitle() {
357-
return "DRL Editor [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
360+
return "DRL Editor [" + FileNameUtil.removeExtension( path,
361+
type ) + "]";
358362
}
359363

360364
@WorkbenchPartView

‎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‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
import org.uberfire.mvp.Command;
5959
import org.uberfire.mvp.ParameterizedCommand;
6060
import org.uberfire.mvp.PlaceRequest;
61-
import org.uberfire.util.FileNameUtil;
6261
import org.uberfire.workbench.events.NotificationEvent;
6362
import org.uberfire.workbench.model.menu.Menus;
63+
import org.uberfire.workbench.type.FileNameUtil;
6464

6565
import static org.uberfire.client.common.ConcurrentChangePopup.*;
6666

@@ -95,6 +95,9 @@ public class DSLEditorPresenter {
9595
@Inject
9696
private MultiPageEditor multiPage;
9797

98+
@Inject
99+
private DSLResourceType type;
100+
98101
@Inject
99102
@New
100103
private FileMenuBuilder menuBuilder;
@@ -316,7 +319,8 @@ public boolean checkIfDirty() {
316319

317320
@WorkbenchPartTitle
318321
public String getTitle() {
319-
return "DRL Editor [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
322+
return "DRL Editor [" + FileNameUtil.removeExtension( path,
323+
type ) + "]";
320324
}
321325

322326
@WorkbenchPartView

‎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‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
import org.uberfire.mvp.Command;
5656
import org.uberfire.mvp.ParameterizedCommand;
5757
import org.uberfire.mvp.PlaceRequest;
58-
import org.uberfire.util.FileNameUtil;
5958
import org.uberfire.workbench.events.NotificationEvent;
6059
import org.uberfire.workbench.model.menu.Menus;
60+
import org.uberfire.workbench.type.FileNameUtil;
6161

6262
import static org.uberfire.client.common.ConcurrentChangePopup.*;
6363

@@ -92,6 +92,9 @@ public class DecisionTableXLSEditorPresenter {
9292
@Inject
9393
private BusyIndicatorView busyIndicatorView;
9494

95+
@Inject
96+
private DecisionTableXLSResourceType type;
97+
9598
@Inject
9699
@New
97100
private FileMenuBuilder menuBuilder;
@@ -249,7 +252,8 @@ public void onClose() {
249252

250253
@WorkbenchPartTitle
251254
public String getTitle() {
252-
return "XLS Decision Table Editor [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
255+
return "XLS Decision Table Editor [" + FileNameUtil.removeExtension( path,
256+
type ) + "]";
253257
}
254258

255259
@WorkbenchPartView

‎drools-wb-screens/drools-wb-enum-editor/drools-wb-enum-editor-client/src/main/java/org/drools/workbench/screens/enums/client/editor/EnumEditorPresenter.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@
5959
import org.uberfire.mvp.Command;
6060
import org.uberfire.mvp.ParameterizedCommand;
6161
import org.uberfire.mvp.PlaceRequest;
62-
import org.uberfire.util.FileNameUtil;
6362
import org.uberfire.workbench.events.NotificationEvent;
6463
import org.uberfire.workbench.model.menu.Menus;
64+
import org.uberfire.workbench.type.FileNameUtil;
6565

6666
import static org.uberfire.client.common.ConcurrentChangePopup.*;
6767

@@ -96,6 +96,9 @@ public class EnumEditorPresenter {
9696
@Inject
9797
private Caller<MetadataService> metadataService;
9898

99+
@Inject
100+
private EnumResourceType type;
101+
99102
@Inject
100103
@New
101104
private FileMenuBuilder menuBuilder;
@@ -333,7 +336,8 @@ public boolean checkIfDirty() {
333336

334337
@WorkbenchPartTitle
335338
public String getTitle() {
336-
return "Enum Editor [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
339+
return "Enum Editor [" + FileNameUtil.removeExtension( path,
340+
type ) + "]";
337341
}
338342

339343
@WorkbenchPartView

‎drools-wb-screens/drools-wb-globals-editor/drools-wb-globals-editor-client/src/main/java/org/drools/workbench/screens/globals/client/editor/GlobalsEditorPresenter.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
import org.uberfire.mvp.Command;
4848
import org.uberfire.mvp.ParameterizedCommand;
4949
import org.uberfire.mvp.PlaceRequest;
50-
import org.uberfire.util.FileNameUtil;
5150
import org.uberfire.workbench.events.NotificationEvent;
5251
import org.uberfire.workbench.model.menu.Menus;
52+
import org.uberfire.workbench.type.FileNameUtil;
5353

5454
import static org.uberfire.client.common.ConcurrentChangePopup.*;
5555

@@ -92,6 +92,9 @@ public class GlobalsEditorPresenter {
9292
@Inject
9393
private PlaceManager placeManager;
9494

95+
@Inject
96+
private GlobalResourceType type;
97+
9598
@Inject
9699
@New
97100
private FileMenuBuilder menuBuilder;
@@ -347,10 +350,12 @@ public boolean checkIfDirty() {
347350

348351
@WorkbenchPartTitle
349352
public String getTitle() {
353+
final String fileName = FileNameUtil.removeExtension( path,
354+
type );
350355
if ( isReadOnly ) {
351-
return GlobalsEditorConstants.INSTANCE.globalsEditorReadOnlyTitle0( FileNameUtil.removeExtension(path.getFileName()) );
356+
return GlobalsEditorConstants.INSTANCE.globalsEditorReadOnlyTitle0( fileName );
352357
}
353-
return GlobalsEditorConstants.INSTANCE.globalsEditorTitle0( FileNameUtil.removeExtension(path.getFileName()) );
358+
return GlobalsEditorConstants.INSTANCE.globalsEditorTitle0( fileName );
354359
}
355360

356361
@WorkbenchMenu

‎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‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
import org.uberfire.mvp.Command;
6464
import org.uberfire.mvp.ParameterizedCommand;
6565
import org.uberfire.mvp.PlaceRequest;
66-
import org.uberfire.util.FileNameUtil;
6766
import org.uberfire.workbench.events.NotificationEvent;
6867
import org.uberfire.workbench.model.menu.Menus;
68+
import org.uberfire.workbench.type.FileNameUtil;
6969

7070
import static org.uberfire.client.common.ConcurrentChangePopup.*;
7171

@@ -104,6 +104,9 @@ public class GuidedDecisionTableEditorPresenter {
104104
@Inject
105105
private Caller<MetadataService> metadataService;
106106

107+
@Inject
108+
private GuidedDTableResourceType type;
109+
107110
@Inject
108111
@New
109112
private FileMenuBuilder menuBuilder;
@@ -362,7 +365,8 @@ public boolean checkIfDirty() {
362365

363366
@WorkbenchPartTitle
364367
public String getTitle() {
365-
return "Guided Decision Table [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
368+
return "Guided Decision Table [" + FileNameUtil.removeExtension( path,
369+
type ) + "]";
366370
}
367371

368372
@WorkbenchPartView

‎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‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666
import org.uberfire.mvp.Command;
6767
import org.uberfire.mvp.ParameterizedCommand;
6868
import org.uberfire.mvp.PlaceRequest;
69-
import org.uberfire.util.FileNameUtil;
7069
import org.uberfire.workbench.events.NotificationEvent;
7170
import org.uberfire.workbench.model.menu.Menus;
71+
import org.uberfire.workbench.type.FileNameUtil;
7272

7373
import static org.uberfire.client.common.ConcurrentChangePopup.*;
7474

@@ -103,6 +103,9 @@ public class GuidedRuleEditorPresenter {
103103
@Inject
104104
private Caller<MetadataService> metadataService;
105105

106+
@Inject
107+
private GuidedRuleDRLResourceType resourceTypeDRL;
108+
106109
@Inject
107110
private GuidedRuleDSLRResourceType resourceTypeDSL;
108111

@@ -379,7 +382,14 @@ public boolean checkIfDirty() {
379382

380383
@WorkbenchPartTitle
381384
public String getTitle() {
382-
return "Guided Editor [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
385+
if ( resourceTypeDRL.accept( path ) ) {
386+
return "Guided Editor [" + FileNameUtil.removeExtension( path,
387+
resourceTypeDRL ) + "]";
388+
} else if ( resourceTypeDSL.accept( path ) ) {
389+
return "Guided Editor [" + FileNameUtil.removeExtension( path,
390+
resourceTypeDSL ) + "]";
391+
}
392+
return path.getFileName();
383393
}
384394

385395
@WorkbenchPartView

‎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‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import javax.inject.Inject;
2525

2626
import com.google.gwt.user.client.ui.IsWidget;
27+
import org.drools.workbench.models.commons.shared.oracle.PackageDataModelOracle;
2728
import org.drools.workbench.models.datamodel.events.ImportAddedEvent;
2829
import org.drools.workbench.models.datamodel.events.ImportRemovedEvent;
29-
import org.drools.workbench.models.commons.shared.oracle.PackageDataModelOracle;
3030
import org.drools.workbench.models.guided.scorecard.shared.ScoreCardModel;
3131
import org.drools.workbench.screens.guided.scorecard.client.type.GuidedScoreCardResourceType;
3232
import org.drools.workbench.screens.guided.scorecard.model.ScoreCardModelContent;
@@ -65,9 +65,9 @@
6565
import org.uberfire.mvp.Command;
6666
import org.uberfire.mvp.ParameterizedCommand;
6767
import org.uberfire.mvp.PlaceRequest;
68-
import org.uberfire.util.FileNameUtil;
6968
import org.uberfire.workbench.events.NotificationEvent;
7069
import org.uberfire.workbench.model.menu.Menus;
70+
import org.uberfire.workbench.type.FileNameUtil;
7171

7272
import static org.uberfire.client.common.ConcurrentChangePopup.*;
7373

@@ -105,6 +105,9 @@ public class GuidedScoreCardEditorPresenter {
105105
@Inject
106106
private PlaceManager placeManager;
107107

108+
@Inject
109+
private GuidedScoreCardResourceType type;
110+
108111
@Inject
109112
@New
110113
private FileMenuBuilder menuBuilder;
@@ -382,10 +385,12 @@ public boolean checkIfDirty() {
382385

383386
@WorkbenchPartTitle
384387
public String getTitle() {
388+
final String fileName = FileNameUtil.removeExtension( path,
389+
type );
385390
if ( isReadOnly ) {
386-
return "Read Only Score Card Viewer [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
391+
return "Read Only Score Card Viewer [" + fileName + "]";
387392
}
388-
return "Score Card Editor [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
393+
return "Score Card Editor [" + fileName + "]";
389394
}
390395

391396
@WorkbenchMenu

‎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‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@
6767
import org.uberfire.mvp.Command;
6868
import org.uberfire.mvp.ParameterizedCommand;
6969
import org.uberfire.mvp.PlaceRequest;
70-
import org.uberfire.util.FileNameUtil;
7170
import org.uberfire.workbench.events.NotificationEvent;
7271
import org.uberfire.workbench.model.menu.Menus;
72+
import org.uberfire.workbench.type.FileNameUtil;
7373

7474
import static org.uberfire.client.common.ConcurrentChangePopup.*;
7575

@@ -107,6 +107,9 @@ public class GuidedRuleTemplateEditorPresenter {
107107
@Inject
108108
private Caller<MetadataService> metadataService;
109109

110+
@Inject
111+
private GuidedRuleTemplateResourceType type;
112+
110113
@Inject
111114
@New
112115
private FileMenuBuilder menuBuilder;
@@ -398,7 +401,8 @@ public boolean checkIfDirty() {
398401

399402
@WorkbenchPartTitle
400403
public String getTitle() {
401-
return "Guided Template [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
404+
return "Guided Template [" + FileNameUtil.removeExtension( path,
405+
type ) + "]";
402406
}
403407

404408
@WorkbenchPartView

0 commit comments

Comments
 (0)