Skip to content

Commit cef2665

Browse files
(v2) More about removing WST deps.
1 parent a9c419b commit cef2665

File tree

7 files changed

+10
-238
lines changed

7 files changed

+10
-238
lines changed

source/v2/phasereditor/phasereditor.assetpack.core/src/phasereditor/assetpack/core/AssetPackModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ public AssetModel findAsset(String sectionKey, String assetKey) {
493493

494494
public String createKey(String prefix) {
495495
for (int i = 0; i < 200; i++) {
496-
String key = prefix + (i == 0 ? "" : new Integer(i));
496+
String key = prefix + (i == 0 ? "" : Integer.valueOf(i));
497497
if (!hasKey(key)) {
498498
return key;
499499
}

source/v2/phasereditor/phasereditor.canvas.ui/plugin.xml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,39 +17,29 @@
1717
<extension
1818
point="org.eclipse.ui.newWizards">
1919
<wizard
20-
category="phasereditor.canvas.ui.wizardCategory"
20+
category="phasereditor.ui.wizardCategory"
2121
class="phasereditor.canvas.ui.wizards.NewWizard_State"
2222
hasPages="true"
2323
icon="platform:/plugin/phasereditor.ui/icons/canvas.png"
2424
id="phasereditor.canvas.ui.newStateWizard"
2525
name="State File">
2626
</wizard>
2727
<wizard
28-
category="phasereditor.canvas.ui.prefabsWizardCategory"
28+
category="phasereditor.ui.wizardCategory"
2929
class="phasereditor.canvas.ui.wizards.NewWizard_Group"
3030
hasPages="true"
3131
icon="platform:/plugin/phasereditor.ui/icons/canvas.png"
3232
id="phasereditor.canvas.ui.newGroupWizard"
3333
name="Group Prefab File">
3434
</wizard>
3535
<wizard
36-
category="phasereditor.canvas.ui.prefabsWizardCategory"
36+
category="phasereditor.ui.wizardCategory"
3737
class="phasereditor.canvas.ui.wizards.NewWizard_Sprite"
3838
hasPages="true"
3939
icon="platform:/plugin/phasereditor.ui/icons/canvas.png"
4040
id="phasereditor.canvas.ui.newSpriteWizard"
4141
name="Sprite Prefab File">
4242
</wizard>
43-
<category
44-
id="phasereditor.canvas.ui.wizardCategory"
45-
name="Canvas"
46-
parentCategory="phasereditor.ui.wizardCategory">
47-
</category>
48-
<category
49-
id="phasereditor.canvas.ui.prefabsWizardCategory"
50-
name="Prefabs"
51-
parentCategory="phasereditor.canvas.ui.wizardCategory">
52-
</category>
5343
</extension>
5444
<extension
5545
point="org.eclipse.ui.menus">

source/v2/phasereditor/phasereditor.help/src/phasereditor/help/PhaserEditorContextProvider.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ public class PhaserEditorContextProvider extends AbstractContextProvider {
1313
private static final long serialVersionUID = 1L;
1414

1515
{
16-
put("org.eclipse.wst.jsdt.ui.java_editor_context", "phasereditor.help.javascripteditor");
16+
//TODO: #RemovingWST
17+
// put("org.eclipse.wst.jsdt.ui.java_editor_context", "phasereditor.help.javascripteditor");
1718
}
1819
};
1920

@@ -33,7 +34,9 @@ public IContext getContext(String id, String locale) {
3334

3435
@Override
3536
public String[] getPlugins() {
36-
return new String[] { "org.eclipse.wst.jsdt.ui" };
37+
//TODO: #RemovingWST
38+
// return new String[] { "org.eclipse.wst.jsdt.ui" };
39+
return new String[] { };
3740
}
3841

3942
}

source/v2/phasereditor/phasereditor.ide/src/phasereditor/ide/intro/PhaserWorkbenchAdvisor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ public void pageActivated(IWorkbenchPage page) {
195195
// XXX: just do not load the JS editor at startup, it creates a strange
196196
// behavior!
197197

198+
// #RemovingWST
198199
// @Override
199200
// public void postStartup() {
200201
// super.postStartup();

source/v2/phasereditor/phasereditor.webtools/.project

Lines changed: 0 additions & 17 deletions
This file was deleted.

source/v2/phasereditor/phasereditor.webtools/build.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

source/v2/phasereditor/phasereditor.webtools/feature.xml

Lines changed: 0 additions & 204 deletions
This file was deleted.

0 commit comments

Comments
 (0)