CleanUp: LtkUI
- Update namings
- Make use of UIResources
Change-Id: I8352c77a9b2d7673d43f2dc834ef082331355ecd
diff --git a/ltk/org.eclipse.statet.ltk.ui/META-INF/MANIFEST.MF b/ltk/org.eclipse.statet.ltk.ui/META-INF/MANIFEST.MF
index c7764f6..d41f7ae 100644
--- a/ltk/org.eclipse.statet.ltk.ui/META-INF/MANIFEST.MF
+++ b/ltk/org.eclipse.statet.ltk.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
Bundle-Vendor: Eclipse StatET
Bundle-Name: StatET LTK - UI (Incubation)
Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.statet.internal.ltk.ui.LTKUIPlugin
+Bundle-Activator: org.eclipse.statet.internal.ltk.ui.LtkUIPlugin
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.statet.ecommons.runtime.core;bundle-version="[4.4.0,4.5.0)",
diff --git a/ltk/org.eclipse.statet.ltk.ui/plugin.xml b/ltk/org.eclipse.statet.ltk.ui/plugin.xml
index 1e57105..0c0d6dd 100644
--- a/ltk/org.eclipse.statet.ltk.ui/plugin.xml
+++ b/ltk/org.eclipse.statet.ltk.ui/plugin.xml
@@ -1140,7 +1140,7 @@
<extension
point="org.eclipse.core.runtime.preferences">
<initializer
- class="org.eclipse.statet.internal.ltk.ui.LTKUIPreferenceInitializer" />
+ class="org.eclipse.statet.internal.ltk.ui.LtkUIPreferenceInitializer" />
</extension>
<extension
point="org.eclipse.ui.preferencePages">
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/BracketLevel.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/BracketLevel.java
index e7c82b2..5c73ee2 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/BracketLevel.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/BracketLevel.java
@@ -14,6 +14,8 @@
package org.eclipse.statet.ecommons.text.ui;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import java.util.List;
import org.eclipse.core.runtime.IStatus;
@@ -44,8 +46,6 @@
import org.eclipse.statet.ecommons.text.core.util.ExclusivePositionUpdater;
import org.eclipse.statet.ecommons.ui.swt.WidgetUtils;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
-
/**
* Linked mode exit policy for auto inserted pairs like brackets or quotes.
@@ -212,7 +212,7 @@
}
}
catch (final Exception e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID,
"An error occurred when preparing auto-undo of autoedit insertions.",
e ));
}
@@ -381,7 +381,7 @@
}
}
catch (final Exception e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID,
"An error occurred when performing auto-undo of autoedit insertions.",
e ));
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/DefaultBrowserInformationInput.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/DefaultBrowserInformationInput.java
index 8f32a1c..4c9d984 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/DefaultBrowserInformationInput.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/DefaultBrowserInformationInput.java
@@ -28,7 +28,7 @@
import org.eclipse.statet.jcommons.lang.NonNullByDefault;
import org.eclipse.statet.jcommons.lang.Nullable;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
+import org.eclipse.statet.internal.ltk.ui.LtkUIPlugin;
/**
@@ -53,7 +53,7 @@
public Formatter() {
JFaceResources.getFontRegistry().addListener(this);
- LTKUIPlugin.getInstance().addStoppingListener(this);
+ LtkUIPlugin.getInstance().addStoppingListener(this);
updateStyleSheet();
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/presentation/AbstractTextStylesConfigurationBlock.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/presentation/AbstractTextStylesConfigurationBlock.java
index 1de17db..23ee613 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/presentation/AbstractTextStylesConfigurationBlock.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/presentation/AbstractTextStylesConfigurationBlock.java
@@ -14,6 +14,8 @@
package org.eclipse.statet.ecommons.text.ui.presentation;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import java.beans.PropertyChangeListener;
import java.io.BufferedReader;
import java.io.IOException;
@@ -92,7 +94,6 @@
import org.eclipse.statet.ecommons.ui.viewers.ViewerUtils.Node;
import org.eclipse.statet.internal.ecommons.text.ui.Messages;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditorViewerConfiguration;
@@ -740,7 +741,7 @@
}
}
catch (final IOException e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID, -1,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID, -1,
NLS.bind("An error occurred when loading the preview code from ''{0}''.", filename), e));
}
finally {
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LTKUIPlugin.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LtkUIPlugin.java
similarity index 87%
rename from ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LTKUIPlugin.java
rename to ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LtkUIPlugin.java
index 7ce1453..e9f1c92 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LTKUIPlugin.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LtkUIPlugin.java
@@ -32,23 +32,20 @@
import org.eclipse.statet.ecommons.ui.util.ImageRegistryUtil;
-import org.eclipse.statet.ltk.ui.LTKUI;
+import org.eclipse.statet.ltk.ui.LtkUI;
-public class LTKUIPlugin extends AbstractUIPlugin {
+public class LtkUIPlugin extends AbstractUIPlugin {
- public static final String BUNDLE_ID= "org.eclipse.statet.ltk.ui"; //$NON-NLS-1$
-
-
- private static LTKUIPlugin instance;
+ private static LtkUIPlugin instance;
/**
* Returns the shared plug-in instance
*
* @return the shared instance
*/
- public static LTKUIPlugin getInstance() {
+ public static LtkUIPlugin getInstance() {
return instance;
}
@@ -68,7 +65,7 @@
private WorkbenchLabelProvider workbenchLabelProvider;
- public LTKUIPlugin() {
+ public LtkUIPlugin() {
}
@@ -94,7 +91,7 @@
}
}
catch (final Exception e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID, -1,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, LtkUI.BUNDLE_ID, -1,
"An error occurred when disposing the shared WorkbenchLabelProvider.", e));
}
this.workbenchLabelProvider= null;
@@ -106,7 +103,7 @@
listener.dispose();
}
catch (final Throwable e) {
- log(new Status(IStatus.ERROR, BUNDLE_ID,
+ log(new Status(IStatus.ERROR, LtkUI.BUNDLE_ID,
"Error occured when dispose module",
e ));
}
@@ -139,9 +136,9 @@
}
final ImageRegistryUtil util= new ImageRegistryUtil(this);
- util.register(LTKUI.OBJ_TEXT_TEMPLATE_IMAGE_ID, ImageRegistryUtil.T_OBJ, "text-template.png"); //$NON-NLS-1$
- util.register(LTKUI.OBJ_TEXT_AT_TAG_IMAGE_ID, ImageRegistryUtil.T_OBJ, "text-at_tag.png"); //$NON-NLS-1$
- util.register(LTKUI.OBJ_TEXT_LINKEDRENAME_IMAGE_ID, ImageRegistryUtil.T_OBJ, "text-linked_rename.png"); //$NON-NLS-1$
+ util.register(LtkUI.OBJ_TEXT_TEMPLATE_IMAGE_ID, ImageRegistryUtil.T_OBJ, "text-template.png"); //$NON-NLS-1$
+ util.register(LtkUI.OBJ_TEXT_AT_TAG_IMAGE_ID, ImageRegistryUtil.T_OBJ, "text-at_tag.png"); //$NON-NLS-1$
+ util.register(LtkUI.OBJ_TEXT_LINKEDRENAME_IMAGE_ID, ImageRegistryUtil.T_OBJ, "text-linked_rename.png"); //$NON-NLS-1$
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LTKUIPreferenceInitializer.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LtkUIPreferenceInitializer.java
similarity index 72%
rename from ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LTKUIPreferenceInitializer.java
rename to ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LtkUIPreferenceInitializer.java
index b7d0e20..26b3249 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LTKUIPreferenceInitializer.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LtkUIPreferenceInitializer.java
@@ -19,17 +19,21 @@
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.eclipse.statet.jcommons.lang.NonNullByDefault;
+
import org.eclipse.statet.ecommons.text.ui.settings.DecorationPreferences;
import org.eclipse.statet.ecommons.workbench.ui.IWaThemeConstants;
import org.eclipse.statet.ecommons.workbench.ui.util.ThemeUtil;
-import org.eclipse.statet.ltk.ui.LTKUIPreferences;
+import org.eclipse.statet.ltk.ui.LtkUI;
+import org.eclipse.statet.ltk.ui.LtkUIPreferences;
-public class LTKUIPreferenceInitializer extends AbstractPreferenceInitializer {
+@NonNullByDefault
+public class LtkUIPreferenceInitializer extends AbstractPreferenceInitializer {
- public LTKUIPreferenceInitializer() {
+ public LtkUIPreferenceInitializer() {
}
@@ -38,18 +42,18 @@
final IScopeContext context= DefaultScope.INSTANCE;
final ThemeUtil theme= new ThemeUtil();
- { final IEclipsePreferences node= context.getNode(LTKUIPlugin.BUNDLE_ID);
+ { final IEclipsePreferences node= context.getNode(LtkUI.BUNDLE_ID);
node.putBoolean(DecorationPreferences.MATCHING_BRACKET_ENABLED_KEY, true);
node.put(DecorationPreferences.MATCHING_BRACKET_COLOR_KEY,
theme.getColorPrefValue(IWaThemeConstants.MATCHING_BRACKET_COLOR) );
}
- { final IEclipsePreferences node= context.getNode(LTKUIPreferences.ASSIST_PREF_QUALIFIER);
- node.putBoolean(LTKUIPreferences.CONTENT_ASSIST_AUTO_ACTIVATION_ENABLED_PREF_KEY, true);
- node.putInt(LTKUIPreferences.CONTENT_ASSIST_AUTO_ACTIVATION_DELAY_PREF_KEY, 150);
- node.putBoolean(LTKUIPreferences.CONTENT_ASSIST_SHOW_SUBSTRING_MATCHES_ENABLED_PREF_KEY, true);
- node.put(LTKUIPreferences.CONTEXT_INFO_BACKGROUND_COLOR_PREF_KEY,
+ { final IEclipsePreferences node= context.getNode(LtkUIPreferences.ASSIST_PREF_QUALIFIER);
+ node.putBoolean(LtkUIPreferences.CONTENT_ASSIST_AUTO_ACTIVATION_ENABLED_PREF_KEY, true);
+ node.putInt(LtkUIPreferences.CONTENT_ASSIST_AUTO_ACTIVATION_DELAY_PREF_KEY, 150);
+ node.putBoolean(LtkUIPreferences.CONTENT_ASSIST_SHOW_SUBSTRING_MATCHES_ENABLED_PREF_KEY, true);
+ node.put(LtkUIPreferences.CONTEXT_INFO_BACKGROUND_COLOR_PREF_KEY,
theme.getColorPrefValue(IWaThemeConstants.INFORMATION_BACKGROUND_COLOR) );
- node.put(LTKUIPreferences.CONTEXT_INFO_FOREGROUND_COLOR_PREF_KEY,
+ node.put(LtkUIPreferences.CONTEXT_INFO_FOREGROUND_COLOR_PREF_KEY,
theme.getColorPrefValue(IWaThemeConstants.INFORMATION_COLOR) );
}
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/config/EditorsPreferencePage.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/config/EditorsPreferencePage.java
index 1c2839d..d956e93 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/config/EditorsPreferencePage.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/config/EditorsPreferencePage.java
@@ -56,7 +56,7 @@
import org.eclipse.statet.ecommons.text.ui.settings.DecorationPreferences;
import org.eclipse.statet.ecommons.ui.util.LayoutUtils;
-import org.eclipse.statet.ltk.ui.LTKUIPreferences;
+import org.eclipse.statet.ltk.ui.LtkUIPreferences;
import org.eclipse.statet.ltk.ui.sourceediting.assist.AssistPreferences;
@@ -120,7 +120,7 @@
final List<AppearanceColorsItem> colors= new ArrayList<>();
// Matching Bracket
- final DecorationPreferences decoPrefs= LTKUIPreferences.getEditorDecorationPreferences();
+ final DecorationPreferences decoPrefs= LtkUIPreferences.getEditorDecorationPreferences();
this.matchingBracketsPref= decoPrefs.getMatchingBracketsEnabled();
prefs.put(this.matchingBracketsPref, null);
{ final AppearanceColorsItem color= new AppearanceColorsItem(
@@ -133,26 +133,26 @@
// Assist
{ final AppearanceColorsItem color= new AppearanceColorsItem(
Messages.Editors_CodeAssistParametersForegrondColor,
- LTKUIPreferences.CONTEXT_INFO_FOREGROUND_COLOR_PREF );
+ LtkUIPreferences.CONTEXT_INFO_FOREGROUND_COLOR_PREF );
colors.add(color);
- prefs.put(color.pref, LTKUIPreferences.ASSIST_GROUP_ID);
+ prefs.put(color.pref, LtkUIPreferences.ASSIST_GROUP_ID);
}
{ final AppearanceColorsItem color= new AppearanceColorsItem(
Messages.Editors_CodeAssistParametersBackgroundColor,
- LTKUIPreferences.CONTEXT_INFO_BACKGROUND_COLOR_PREF );
+ LtkUIPreferences.CONTEXT_INFO_BACKGROUND_COLOR_PREF );
colors.add(color);
- prefs.put(color.pref, LTKUIPreferences.ASSIST_GROUP_ID);
+ prefs.put(color.pref, LtkUIPreferences.ASSIST_GROUP_ID);
}
- final AssistPreferences assistPreferences= LTKUIPreferences.getAssistPreferences();
+ final AssistPreferences assistPreferences= LtkUIPreferences.getAssistPreferences();
this.contentAssistShowSubstringMatchesPref= assistPreferences.getShowSubstringMatchesPref();
- prefs.put(this.contentAssistShowSubstringMatchesPref, LTKUIPreferences.ASSIST_GROUP_ID);
- this.contentAssistDelayPref= LTKUIPreferences.CONTENT_ASSIST_AUTO_ACTIVATION_DELAY_PREF;
- prefs.put(this.contentAssistDelayPref, LTKUIPreferences.ASSIST_GROUP_ID);
+ prefs.put(this.contentAssistShowSubstringMatchesPref, LtkUIPreferences.ASSIST_GROUP_ID);
+ this.contentAssistDelayPref= LtkUIPreferences.CONTENT_ASSIST_AUTO_ACTIVATION_DELAY_PREF;
+ prefs.put(this.contentAssistDelayPref, LtkUIPreferences.ASSIST_GROUP_ID);
this.contentAssistAutoSinglePref= assistPreferences.getAutoInsertSinglePref();
- prefs.put(this.contentAssistAutoSinglePref, LTKUIPreferences.ASSIST_GROUP_ID);
+ prefs.put(this.contentAssistAutoSinglePref, LtkUIPreferences.ASSIST_GROUP_ID);
this.contentAssistAutoCommonPref= assistPreferences.getAutoInsertPrefixPref();
- prefs.put(this.contentAssistAutoCommonPref, LTKUIPreferences.ASSIST_GROUP_ID);
+ prefs.put(this.contentAssistAutoCommonPref, LtkUIPreferences.ASSIST_GROUP_ID);
// Register preferences
setupPreferenceManager(prefs);
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/refactoring/ECommonsRefactoring.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/refactoring/ECommonsRefactoring.java
index 6a62cc7..bb7279e 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/refactoring/ECommonsRefactoring.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/refactoring/ECommonsRefactoring.java
@@ -19,13 +19,13 @@
import org.eclipse.statet.ecommons.preferences.core.Preference.BooleanPref;
import org.eclipse.statet.ecommons.preferences.core.util.PreferenceUtils;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
+import org.eclipse.statet.ltk.ui.LtkUI;
public class ECommonsRefactoring {
- public static final BooleanPref PREF_SAVE_ALL_EDITORS= new BooleanPref(LTKUIPlugin.BUNDLE_ID + "/Refactoring", "SaveAll.enabled");
+ public static final BooleanPref PREF_SAVE_ALL_EDITORS= new BooleanPref(LtkUI.BUNDLE_ID + "/Refactoring", "SaveAll.enabled");
public static boolean getSaveAllEditors() {
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/FileBufferWorkingBuffer.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/FileBufferWorkingBuffer.java
index 58ff837..81a21f5 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/FileBufferWorkingBuffer.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/FileBufferWorkingBuffer.java
@@ -14,6 +14,8 @@
package org.eclipse.statet.ltk.ui;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import java.lang.reflect.InvocationTargetException;
import java.util.concurrent.atomic.AtomicReference;
@@ -29,7 +31,6 @@
import org.eclipse.statet.ecommons.ui.util.UIAccess;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
import org.eclipse.statet.ltk.model.core.element.SourceDocumentRunnable;
import org.eclipse.statet.ltk.model.core.element.SourceUnit;
@@ -65,7 +66,7 @@
}
synchronized (docLock) {
if (runnable.getStampAssertion() > 0 && document.getModificationStamp() != runnable.getStampAssertion()) {
- throw new CoreException(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID,
+ throw new CoreException(new Status(IStatus.ERROR, BUNDLE_ID,
"Document out of sync (usuallly caused by concurrent document modifications)." ));
}
runnable.run();
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/LTKUI.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/LTKUI.java
deleted file mode 100644
index 970765f..0000000
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/LTKUI.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*=============================================================================#
- # Copyright (c) 2009, 2021 Stephan Wahlbrink and others.
- #
- # This program and the accompanying materials are made available under the
- # terms of the Eclipse Public License 2.0 which is available at
- # https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
- # which is available at https://www.apache.org/licenses/LICENSE-2.0.
- #
- # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
- #
- # Contributors:
- # Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
- #=============================================================================*/
-
-package org.eclipse.statet.ltk.ui;
-
-import org.eclipse.jface.resource.ImageRegistry;
-
-import org.eclipse.statet.jcommons.lang.NonNullByDefault;
-
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
-
-
-@NonNullByDefault
-public class LTKUI {
-
-
- public static final String OBJ_TEXT_TEMPLATE_IMAGE_ID= LTKUIPlugin.BUNDLE_ID + "/image/obj/text.template"; //$NON-NLS-1$
- public static final String OBJ_TEXT_AT_TAG_IMAGE_ID= LTKUIPlugin.BUNDLE_ID + "/image/obj/text.at_tag"; //$NON-NLS-1$
-
- public static final String OBJ_TEXT_LINKEDRENAME_IMAGE_ID= LTKUIPlugin.BUNDLE_ID + "/image/obj/assist.linked_rename"; //$NON-NLS-1$
-
-
- public static ImageRegistry getImages() {
- return LTKUIPlugin.getInstance().getImageRegistry();
- }
-
-}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/LtkUI.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/LtkUI.java
new file mode 100644
index 0000000..3b6ab9c
--- /dev/null
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/LtkUI.java
@@ -0,0 +1,50 @@
+/*=============================================================================#
+ # Copyright (c) 2009, 2021 Stephan Wahlbrink and others.
+ #
+ # This program and the accompanying materials are made available under the
+ # terms of the Eclipse Public License 2.0 which is available at
+ # https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+ # which is available at https://www.apache.org/licenses/LICENSE-2.0.
+ #
+ # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+ #
+ # Contributors:
+ # Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
+ #=============================================================================*/
+
+package org.eclipse.statet.ltk.ui;
+
+import org.eclipse.statet.jcommons.lang.NonNullByDefault;
+
+import org.eclipse.statet.ecommons.ui.util.UIResources;
+
+import org.eclipse.statet.internal.ltk.ui.LtkUIPlugin;
+
+
+@NonNullByDefault
+public class LtkUI {
+
+
+ public static final String BUNDLE_ID= "org.eclipse.statet.ltk.ui"; //$NON-NLS-1$
+
+
+ private static final String NS= BUNDLE_ID;
+
+ public static final String OBJ_TEXT_TEMPLATE_IMAGE_ID= NS + "/image/obj/text.template"; //$NON-NLS-1$
+ public static final String OBJ_TEXT_AT_TAG_IMAGE_ID= NS + "/image/obj/text.at_tag"; //$NON-NLS-1$
+
+ public static final String OBJ_TEXT_LINKEDRENAME_IMAGE_ID= NS + "/image/obj/assist.linked_rename"; //$NON-NLS-1$
+
+
+ private static class UIInstance {
+ private static final UIResources RESOURCES= new UIResources(LtkUIPlugin.getInstance().getImageRegistry());
+ }
+
+ public static UIResources getUIResources() {
+ return UIInstance.RESOURCES;
+ }
+
+
+ private LtkUI() {}
+
+}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/LTKUIPreferences.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/LtkUIPreferences.java
similarity index 90%
rename from ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/LTKUIPreferences.java
rename to ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/LtkUIPreferences.java
index 827a7e6..29d706b 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/LTKUIPreferences.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/LtkUIPreferences.java
@@ -14,6 +14,8 @@
package org.eclipse.statet.ltk.ui;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.statet.jcommons.lang.NonNullByDefault;
@@ -24,21 +26,20 @@
import org.eclipse.statet.ecommons.preferences.ui.RGBPref;
import org.eclipse.statet.ecommons.text.ui.settings.DecorationPreferences;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
+import org.eclipse.statet.internal.ltk.ui.LtkUIPlugin;
import org.eclipse.statet.ltk.ui.sourceediting.assist.AssistPreferences;
@NonNullByDefault
-public class LTKUIPreferences {
+public class LtkUIPreferences {
public static IPreferenceStore getPreferenceStore() {
- return LTKUIPlugin.getInstance().getPreferenceStore();
+ return LtkUIPlugin.getInstance().getPreferenceStore();
}
- private static DecorationPreferences DECORATION_PREFERENCES= new DecorationPreferences(
- LTKUIPlugin.BUNDLE_ID );
+ private static DecorationPreferences DECORATION_PREFERENCES= new DecorationPreferences(BUNDLE_ID);
public static DecorationPreferences getEditorDecorationPreferences() {
return DECORATION_PREFERENCES;
@@ -47,7 +48,7 @@
public static final String ASSIST_GROUP_ID= "Ltk/assist"; //$NON-NLS-1$
- public static final String ASSIST_PREF_QUALIFIER= LTKUIPlugin.BUNDLE_ID + "/assist"; //$NON-NLS-1$
+ public static final String ASSIST_PREF_QUALIFIER= BUNDLE_ID + "/assist"; //$NON-NLS-1$
public static final String CONTENT_ASSIST_AUTO_ACTIVATION_ENABLED_PREF_KEY=
"ContentAssist.AutoActivation.enabled"; //$NON-NLS-1$
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/PostSelectionWithElementInfoController.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/PostSelectionWithElementInfoController.java
index 0c1a922..67fb3c7 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/PostSelectionWithElementInfoController.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/PostSelectionWithElementInfoController.java
@@ -14,6 +14,8 @@
package org.eclipse.statet.ltk.ui;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import java.util.ArrayList;
import java.util.List;
@@ -29,7 +31,6 @@
import org.eclipse.statet.jcommons.collections.CopyOnWriteIdentityListSet;
import org.eclipse.statet.jcommons.collections.ImIdentityList;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
import org.eclipse.statet.ltk.model.core.element.LtkModelElement;
import org.eclipse.statet.ltk.model.core.element.LtkModelElementDelta;
import org.eclipse.statet.ltk.model.core.element.SourceUnit;
@@ -332,8 +333,7 @@
private void logListenerError(final Throwable e) {
- StatusManager.getManager().handle(new Status(
- IStatus.ERROR, LTKUIPlugin.BUNDLE_ID, 0,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID, 0,
"An error occurred when calling a registered listener.", e )); //$NON-NLS-1$
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/compare/CompareUtilities.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/compare/CompareUtilities.java
index 59b1385..06a2eac 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/compare/CompareUtilities.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/compare/CompareUtilities.java
@@ -14,6 +14,8 @@
package org.eclipse.statet.ltk.ui.compare;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@ -28,8 +30,6 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.ui.statushandlers.StatusManager;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
-
class CompareUtilities {
@@ -46,7 +46,7 @@
return readString(input, encoding);
}
catch (final CoreException e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID, -1,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID, -1,
"An error occurred when loading compare input.", e));
}
return ""; //$NON-NLS-1$
@@ -65,7 +65,7 @@
}
}
catch (final IOException e) {
- throw new CoreException(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID, -1, e.getMessage(), e));
+ throw new CoreException(new Status(IStatus.ERROR, BUNDLE_ID, -1, e.getMessage(), e));
}
return s;
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/refactoring/RefactoringBasedStatus.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/refactoring/RefactoringBasedStatus.java
index 86eea65..f48e338 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/refactoring/RefactoringBasedStatus.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/refactoring/RefactoringBasedStatus.java
@@ -14,11 +14,11 @@
package org.eclipse.statet.ltk.ui.refactoring;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import org.eclipse.core.runtime.IStatus;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
-
/**
* {@link IStatus} wrapping a {@link RefactoringStatus}.
@@ -36,7 +36,7 @@
@Override
public String getPlugin() {
- return LTKUIPlugin.BUNDLE_ID;
+ return BUNDLE_ID;
}
@Override
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/refactoring/RefactoringSaveHelper.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/refactoring/RefactoringSaveHelper.java
index 99d01f9..8a8517d 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/refactoring/RefactoringSaveHelper.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/refactoring/RefactoringSaveHelper.java
@@ -14,6 +14,8 @@
package org.eclipse.statet.ltk.ui.refactoring;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import java.lang.reflect.InvocationTargetException;
import java.util.List;
@@ -46,7 +48,6 @@
import org.eclipse.statet.ecommons.resources.core.BuildUtils;
import org.eclipse.statet.ecommons.ui.util.UIAccess;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
import org.eclipse.statet.internal.ltk.ui.refactoring.ECommonsRefactoring;
import org.eclipse.statet.internal.ltk.ui.refactoring.Messages;
import org.eclipse.statet.ltk.ui.EditorUtils;
@@ -171,7 +172,7 @@
return false;
}
catch (final InvocationTargetException e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID, -1,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID, -1,
Messages.RefactoringStarter_UnexpectedException, e.getCause()) );
return false;
}
@@ -184,7 +185,7 @@
return true;
}
catch (final CoreException e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID, -1,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID, -1,
Messages.RefactoringStarter_UnexpectedException, e) );
return false;
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/AbstractAutoEditStrategy.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/AbstractAutoEditStrategy.java
index 13d4e81..15b5f4a 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/AbstractAutoEditStrategy.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/AbstractAutoEditStrategy.java
@@ -14,6 +14,8 @@
package org.eclipse.statet.ltk.ui.sourceediting;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.text.AbstractDocument;
@@ -43,7 +45,6 @@
import org.eclipse.statet.ecommons.text.core.treepartitioner.TreePartition;
import org.eclipse.statet.ecommons.ui.util.UIAccess;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
import org.eclipse.statet.ltk.core.SourceContent;
@@ -185,7 +186,7 @@
event.doit= command.doit;
}
catch (final Exception e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID, -1,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID, -1,
"An error occurred when customizing action for pressed key in auto edit strategy.", //$NON-NLS-1$
e ));
}
@@ -215,7 +216,7 @@
doCustomizeOtherCommand(command, partition);
}
catch (final Exception e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID, -1,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID, -1,
"An error occurred when customizing action for document command in auto edit strategy.", e )); //$NON-NLS-1$
}
finally {
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/EditorInformationProvider.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/EditorInformationProvider.java
index ebb3769..692b6f3 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/EditorInformationProvider.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/EditorInformationProvider.java
@@ -16,6 +16,8 @@
import static org.eclipse.statet.jcommons.lang.ObjectUtils.nonNullAssert;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import java.lang.reflect.InvocationTargetException;
import java.util.concurrent.atomic.AtomicReference;
@@ -45,7 +47,6 @@
import org.eclipse.statet.ecommons.text.core.util.TextUtils;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
import org.eclipse.statet.ltk.ui.sourceediting.assist.AssistInvocationContext;
import org.eclipse.statet.ltk.ui.sourceediting.assist.InfoHover;
@@ -126,7 +127,7 @@
}
}
catch (final Exception e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID,
"An error occurred when preparing the information hover (command).", e ));
}
return null;
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/EditorTextInfoHoverProxy.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/EditorTextInfoHoverProxy.java
index 87cfc28..22162c1 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/EditorTextInfoHoverProxy.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/EditorTextInfoHoverProxy.java
@@ -16,6 +16,8 @@
import static org.eclipse.statet.jcommons.lang.ObjectUtils.nonNullAssert;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import java.util.concurrent.atomic.AtomicReference;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -41,7 +43,6 @@
import org.eclipse.statet.ecommons.text.core.util.TextUtils;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
import org.eclipse.statet.ltk.ui.sourceediting.assist.AssistInvocationContext;
import org.eclipse.statet.ltk.ui.sourceediting.assist.CombinedHover;
import org.eclipse.statet.ltk.ui.sourceediting.assist.InfoHover;
@@ -133,7 +134,7 @@
}
}
catch (final Exception e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID,
NLS.bind("An error occurred when preparing the information hover ''{0}'' (mouse).",
this.descriptor.getName() ), e ));
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/MultiContentSectionSourceViewerConfiguration.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/MultiContentSectionSourceViewerConfiguration.java
index 907120d..6e7b5b7 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/MultiContentSectionSourceViewerConfiguration.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/MultiContentSectionSourceViewerConfiguration.java
@@ -14,6 +14,8 @@
package org.eclipse.statet.ltk.ui.sourceediting;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
@@ -38,7 +40,7 @@
import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
import org.eclipse.statet.ecommons.ui.dialogs.DialogUtils;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
+import org.eclipse.statet.internal.ltk.ui.LtkUIPlugin;
import org.eclipse.statet.ltk.ui.sourceediting.assist.ContentAssist;
import org.eclipse.statet.ltk.ui.sourceediting.assist.MultiContentSectionQuickAssistProcessor;
@@ -83,7 +85,7 @@
damager= super.getDamager(contentType);
}
if (DEBUG && damager == null) {
- StatusManager.getManager().handle(new Status(IStatus.WARNING, LTKUIPlugin.BUNDLE_ID,
+ StatusManager.getManager().handle(new Status(IStatus.WARNING, BUNDLE_ID,
"No presentation damager for contentType= " + contentType + "." ));
}
return damager;
@@ -97,7 +99,7 @@
repairer= super.getRepairer(contentType);
}
if (DEBUG && repairer == null) {
- StatusManager.getManager().handle(new Status(IStatus.WARNING, LTKUIPlugin.BUNDLE_ID,
+ StatusManager.getManager().handle(new Status(IStatus.WARNING, BUNDLE_ID,
"No presentation repairer for contentType= " + contentType + "." ));
}
return repairer;
@@ -291,7 +293,7 @@
if (getSourceEditor() != null) {
final ContentAssist assistant= new LazyContentAssist();
assistant.setDocumentPartitioning(getConfiguredDocumentPartitioning(null));
- assistant.setRestoreCompletionProposalSize(DialogUtils.getDialogSettings(LTKUIPlugin.getInstance(), "ContentAssist.Proposal.size")); //$NON-NLS-1$
+ assistant.setRestoreCompletionProposalSize(DialogUtils.getDialogSettings(LtkUIPlugin.getInstance(), "ContentAssist.Proposal.size")); //$NON-NLS-1$
initContentAssist(assistant);
return assistant;
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/QuickOutlineInformationControl.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/QuickOutlineInformationControl.java
index 920d66c..b08a880 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/QuickOutlineInformationControl.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/QuickOutlineInformationControl.java
@@ -27,7 +27,7 @@
import org.eclipse.statet.ecommons.ui.dialogs.DialogUtils;
import org.eclipse.statet.ecommons.ui.dialogs.QuickTreeInformationControl;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
+import org.eclipse.statet.internal.ltk.ui.LtkUIPlugin;
import org.eclipse.statet.ltk.model.core.element.LtkModelElement;
import org.eclipse.statet.ltk.model.core.element.LtkModelElementFilter;
import org.eclipse.statet.ltk.model.core.element.SourceElement;
@@ -94,7 +94,7 @@
@Override
protected IDialogSettings getDialogSettings() {
- return DialogUtils.getDialogSettings(LTKUIPlugin.getInstance(), "EditorStructurePopup"); //$NON-NLS-1$
+ return DialogUtils.getDialogSettings(LtkUIPlugin.getInstance(), "EditorStructurePopup"); //$NON-NLS-1$
}
@Override
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorProgressHandler.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorProgressHandler.java
index c8f8ac6..b1bfa7e 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorProgressHandler.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorProgressHandler.java
@@ -14,6 +14,8 @@
package org.eclipse.statet.ltk.ui.sourceediting;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import java.lang.reflect.InvocationTargetException;
import org.eclipse.core.commands.AbstractHandler;
@@ -32,7 +34,6 @@
import org.eclipse.statet.jcommons.lang.Nullable;
import org.eclipse.statet.internal.ltk.ui.EditingMessages;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
import org.eclipse.statet.ltk.model.core.element.SourceUnit;
@@ -93,7 +94,7 @@
});
}
catch (final InvocationTargetException e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID, -1,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID, -1,
NLS.bind(EditingMessages.GenericAction_error_message, getTaskLabel()),
e.getTargetException() ));
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfiguration.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfiguration.java
index be973c1..6300b1f 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfiguration.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfiguration.java
@@ -14,6 +14,8 @@
package org.eclipse.statet.ltk.ui.sourceediting;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -75,8 +77,8 @@
import org.eclipse.statet.ecommons.ui.dialogs.DialogUtils;
import org.eclipse.statet.ecommons.ui.util.InformationDispatchHandler;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
-import org.eclipse.statet.ltk.ui.LTKUIPreferences;
+import org.eclipse.statet.internal.ltk.ui.LtkUIPlugin;
+import org.eclipse.statet.ltk.ui.LtkUIPreferences;
import org.eclipse.statet.ltk.ui.sourceediting.assist.AssistPreferences;
import org.eclipse.statet.ltk.ui.sourceediting.assist.ContentAssist;
import org.eclipse.statet.ltk.ui.sourceediting.assist.InfoHoverDescriptor;
@@ -241,7 +243,7 @@
}
final ITokenScanner scanner= this.scanners.get(contentType);
if (DEBUG && scanner == null) {
- StatusManager.getManager().handle(new Status(IStatus.WARNING, LTKUIPlugin.BUNDLE_ID,
+ StatusManager.getManager().handle(new Status(IStatus.WARNING, BUNDLE_ID,
"No scanner for contentType= " + contentType + "." ));
}
return scanner;
@@ -278,7 +280,7 @@
@Override
public void handleSettingsChanged(final Set<String> groupIds, final Map<String, Object> options) {
if (this.assistPreferences != null
- && (groupIds.contains(LTKUIPreferences.ASSIST_GROUP_ID) || groupIds.contains(this.assistPreferences.getGroupId())) ) {
+ && (groupIds.contains(LtkUIPreferences.ASSIST_GROUP_ID) || groupIds.contains(this.assistPreferences.getGroupId())) ) {
if (this.contentAssistant != null) {
this.assistPreferences.configure(this.contentAssistant);
}
@@ -413,7 +415,7 @@
if (getSourceEditor() != null) {
final ContentAssist assistant= new ContentAssist();
assistant.setDocumentPartitioning(getConfiguredDocumentPartitioning(null));
- assistant.setRestoreCompletionProposalSize(DialogUtils.getDialogSettings(LTKUIPlugin.getInstance(), "ContentAssist.Proposal.size")); //$NON-NLS-1$
+ assistant.setRestoreCompletionProposalSize(DialogUtils.getDialogSettings(LtkUIPlugin.getInstance(), "ContentAssist.Proposal.size")); //$NON-NLS-1$
initContentAssist(assistant);
return assistant;
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/AssistPreferences.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/AssistPreferences.java
index ffdf010..c42306c 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/AssistPreferences.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/AssistPreferences.java
@@ -27,7 +27,7 @@
import org.eclipse.statet.ecommons.preferences.core.util.PreferenceUtils;
import org.eclipse.statet.ecommons.preferences.ui.RGBPref;
-import org.eclipse.statet.ltk.ui.LTKUIPreferences;
+import org.eclipse.statet.ltk.ui.LtkUIPreferences;
/**
@@ -38,7 +38,7 @@
private static final BooleanPref CONTENT_ASSIST_AUTO_ACTIVATION_ENABLED_PREF= new BooleanPref(
- LTKUIPreferences.ASSIST_PREF_QUALIFIER, LTKUIPreferences.CONTENT_ASSIST_AUTO_ACTIVATION_ENABLED_PREF_KEY);
+ LtkUIPreferences.ASSIST_PREF_QUALIFIER, LtkUIPreferences.CONTENT_ASSIST_AUTO_ACTIVATION_ENABLED_PREF_KEY);
private final String qualifier;
@@ -96,15 +96,15 @@
this.qualifier= prefQualifier;
this.autoActivationEnabled= CONTENT_ASSIST_AUTO_ACTIVATION_ENABLED_PREF;
- this.autoActivationDelay= LTKUIPreferences.CONTENT_ASSIST_AUTO_ACTIVATION_DELAY_PREF;
+ this.autoActivationDelay= LtkUIPreferences.CONTENT_ASSIST_AUTO_ACTIVATION_DELAY_PREF;
- this.showSubstringMatches= LTKUIPreferences.CONTENT_ASSIST_SHOW_SUBSTRING_MATCHES_ENABLED_PREF;
+ this.showSubstringMatches= LtkUIPreferences.CONTENT_ASSIST_SHOW_SUBSTRING_MATCHES_ENABLED_PREF;
this.autoInsertSingle= new BooleanPref(prefQualifier, "AutoInsert.Single.enable"); //$NON-NLS-1$
this.autoInsertPrefix= new BooleanPref(prefQualifier, "AutoInsert.Prefix.enable"); //$NON-NLS-1$
- this.informationBackground= LTKUIPreferences.CONTEXT_INFO_BACKGROUND_COLOR_PREF;
- this.informationForeground= LTKUIPreferences.CONTEXT_INFO_FOREGROUND_COLOR_PREF;
+ this.informationBackground= LtkUIPreferences.CONTEXT_INFO_BACKGROUND_COLOR_PREF;
+ this.informationForeground= LtkUIPreferences.CONTEXT_INFO_FOREGROUND_COLOR_PREF;
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/ContentAssist.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/ContentAssist.java
index 6a2091d..e3289c7 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/ContentAssist.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/ContentAssist.java
@@ -14,6 +14,8 @@
package org.eclipse.statet.ltk.ui.sourceediting.assist;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.bindings.keys.KeySequence;
@@ -36,8 +38,6 @@
import org.eclipse.statet.ecommons.ui.SharedMessages;
import org.eclipse.statet.ecommons.ui.workbench.WorkbenchUIUtils;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
-
/**
* LTK content assistant.
@@ -236,7 +236,7 @@
super.hide();
}
catch (final RuntimeException e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID,
"An error occurred when hiding content assistant.", e ));
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/InfoHoverDescriptor.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/InfoHoverDescriptor.java
index 179fab2..78d662f 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/InfoHoverDescriptor.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/InfoHoverDescriptor.java
@@ -14,6 +14,8 @@
package org.eclipse.statet.ltk.ui.sourceediting.assist;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IStatus;
@@ -24,7 +26,6 @@
import org.eclipse.statet.jcommons.lang.Nullable;
import org.eclipse.statet.internal.ltk.ui.AdvancedExtensionsInternal;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
/**
@@ -79,7 +80,7 @@
AdvancedExtensionsInternal.CONFIG_CLASS_ATTRIBUTE_NAME);
}
catch (final CoreException e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID, 0,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID, 0,
"Could not create text hover '" + this.name + "'.", e ));
return null;
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/LinkedNamesAssistProposal.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/LinkedNamesAssistProposal.java
index 9b40228..b8a993f 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/LinkedNamesAssistProposal.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/LinkedNamesAssistProposal.java
@@ -16,6 +16,8 @@
import static org.eclipse.statet.jcommons.lang.ObjectUtils.nonNullAssert;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -45,8 +47,7 @@
import org.eclipse.statet.ecommons.text.ui.DefaultBrowserInformationInput;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
-import org.eclipse.statet.ltk.ui.LTKUI;
+import org.eclipse.statet.ltk.ui.LtkUI;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditor;
import org.eclipse.statet.ltk.ui.sourceediting.TextEditToolSynchronizer;
@@ -85,7 +86,7 @@
{ //skip delete at end of linked position
final LinkedPosition position= model.findPosition(new LinkedPosition(
this.document, offset, 0, LinkedPositionGroup.NO_STOP));
- if (position != null && offset >= position.getOffset()+position.getLength() && length == 0) {
+ if (position != null && offset >= position.getOffset() + position.getLength() && length == 0) {
event.doit= false;
}
return null;
@@ -189,7 +190,7 @@
viewer.setSelectedRange(selectionStartOffset, selectionStartOffset + selectionEndOffset);
}
catch (final BadLocationException e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID, -1,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID, -1,
"Error initializing linked rename.", e )); //$NON-NLS-1$
}
}
@@ -244,7 +245,7 @@
@Override
public Image getImage() {
- return LTKUI.getImages().get(LTKUI.OBJ_TEXT_LINKEDRENAME_IMAGE_ID);
+ return LtkUI.getUIResources().getImage(LtkUI.OBJ_TEXT_LINKEDRENAME_IMAGE_ID);
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/PathCompletionComputor.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/PathCompletionComputor.java
index 57f029e..c907e88 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/PathCompletionComputor.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/PathCompletionComputor.java
@@ -50,7 +50,7 @@
import org.eclipse.statet.ecommons.runtime.core.util.PathUtils;
import org.eclipse.statet.ecommons.ui.SharedUIResources;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
+import org.eclipse.statet.internal.ltk.ui.LtkUIPlugin;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditor;
import org.eclipse.statet.ltk.ui.sourceediting.assist.SourceProposal.ProposalParameters;
@@ -142,7 +142,7 @@
if (this.workspaceRef != null) {
final IResource member= this.workspaceRef.findMember(this.fileStore.getName(), true);
if (member != null) {
- image= LTKUIPlugin.getInstance().getWorkbenchLabelProvider().getImage(member);
+ image= LtkUIPlugin.getInstance().getWorkbenchLabelProvider().getImage(member);
}
}
if (image == null) {
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/SourceProposal.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/SourceProposal.java
index 3405612..1bd71f7 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/SourceProposal.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/SourceProposal.java
@@ -16,6 +16,8 @@
import static org.eclipse.statet.jcommons.lang.ObjectUtils.nonNullAssert;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.text.BadLocationException;
@@ -54,8 +56,6 @@
import org.eclipse.statet.ecommons.ui.SharedUIResources;
import org.eclipse.statet.ecommons.ui.viewers.ViewerLabelUtils;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
-
@NonNullByDefault
public abstract class SourceProposal<TContext extends AssistInvocationContext> implements AssistProposal,
@@ -443,7 +443,7 @@
}
}
catch (final BadLocationException e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID,
"Failed to apply completion proposal (" + getClass().getName() +").",
e ));
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/TemplateCompletionComputer.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/TemplateCompletionComputer.java
index 2f1d781..43c8c42 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/TemplateCompletionComputer.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/TemplateCompletionComputer.java
@@ -40,8 +40,8 @@
import org.eclipse.statet.jcommons.text.core.SearchPattern;
import org.eclipse.statet.jcommons.text.core.TextRegion;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
-import org.eclipse.statet.ltk.ui.LTKUI;
+import org.eclipse.statet.internal.ltk.ui.LtkUIPlugin;
+import org.eclipse.statet.ltk.ui.LtkUI;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditor;
import org.eclipse.statet.ltk.ui.sourceediting.assist.SourceProposal.ProposalParameters;
import org.eclipse.statet.ltk.ui.sourceediting.assist.TemplateProposal.TemplateProposalParameters;
@@ -288,7 +288,7 @@
}
protected @Nullable Image getImage(final Template template) {
- return LTKUIPlugin.getInstance().getImageRegistry().get(LTKUI.OBJ_TEXT_TEMPLATE_IMAGE_ID);
+ return LtkUIPlugin.getInstance().getImageRegistry().get(LtkUI.OBJ_TEXT_TEMPLATE_IMAGE_ID);
}
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/TemplateProposal.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/TemplateProposal.java
index 679cb18..c512933 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/TemplateProposal.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/TemplateProposal.java
@@ -16,6 +16,8 @@
import static org.eclipse.statet.jcommons.lang.ObjectUtils.nonNullAssert;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import java.util.Comparator;
import com.ibm.icu.text.Collator;
@@ -57,8 +59,8 @@
import org.eclipse.statet.ecommons.text.ui.DefaultBrowserInformationInput;
import org.eclipse.statet.ecommons.text.ui.PositionBasedCompletionProposal;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
-import org.eclipse.statet.ltk.ui.LTKUI;
+import org.eclipse.statet.internal.ltk.ui.LtkUIPlugin;
+import org.eclipse.statet.ltk.ui.LtkUI;
import org.eclipse.statet.ltk.ui.sourceediting.TextEditToolSynchronizer;
import org.eclipse.statet.ltk.ui.templates.IWorkbenchTemplateContext;
import org.eclipse.statet.ltk.ui.util.LTKSelectionUtils;
@@ -153,7 +155,7 @@
public TemplateProposal(final TemplateProposalParameters<?> parameters) {
this(parameters,
- LTKUIPlugin.getInstance().getImageRegistry().get(LTKUI.OBJ_TEXT_TEMPLATE_IMAGE_ID) );
+ LtkUIPlugin.getInstance().getImageRegistry().get(LtkUI.OBJ_TEXT_TEMPLATE_IMAGE_ID) );
}
@@ -339,7 +341,7 @@
}
}
catch (final BadLocationException | BadPositionCategoryException e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID, 0,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID, 0,
"Template Evaluation Error",
e ));
applyData.clearSelection();
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/folding/FoldingEditorAddon.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/folding/FoldingEditorAddon.java
index c83cbf2..f1ed8d3 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/folding/FoldingEditorAddon.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/folding/FoldingEditorAddon.java
@@ -14,6 +14,8 @@
package org.eclipse.statet.ltk.ui.sourceediting.folding;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Iterator;
@@ -43,7 +45,6 @@
import org.eclipse.statet.ecommons.preferences.SettingsChangeNotifier.ChangeListener;
import org.eclipse.statet.ecommons.text.TextUtil;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
import org.eclipse.statet.ltk.ast.core.AstInfo;
import org.eclipse.statet.ltk.core.SourceModelStamp;
import org.eclipse.statet.ltk.model.core.ModelManager;
@@ -410,7 +411,7 @@
return Status.OK_STATUS;
}
catch (final CoreException e) {
- return new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID,
+ return new Status(IStatus.ERROR, BUNDLE_ID,
NLS.bind("An error occurred when saving the code folding state for {0}", this.resource.toString()),
e );
}
@@ -503,7 +504,7 @@
new SaveJob(resource, propertyName).schedule();
}
catch (final CoreException e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID,
NLS.bind("An error occurred when saving the code folding state for {0}", resource.toString()),
e ));
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/AbstractEditorTemplatesPage.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/AbstractEditorTemplatesPage.java
index d22346a..13c7e52 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/AbstractEditorTemplatesPage.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/AbstractEditorTemplatesPage.java
@@ -14,6 +14,8 @@
package org.eclipse.statet.ltk.ui.templates.config;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import java.util.Map;
import java.util.Set;
@@ -51,7 +53,7 @@
import org.eclipse.statet.ecommons.ui.ISettingsChangedHandler;
import org.eclipse.statet.ecommons.ui.util.UIAccess;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
+import org.eclipse.statet.internal.ltk.ui.LtkUIPlugin;
import org.eclipse.statet.ltk.model.core.ModelManager;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditor;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditorViewerConfigurator;
@@ -180,7 +182,7 @@
proposal.apply(sourceEditor.getViewer(), (char)0, 0, region.getStartOffset());
}
catch (final Exception e) {
- LTKUIPlugin.log(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID,
+ LtkUIPlugin.log(new Status(IStatus.ERROR, BUNDLE_ID,
"An error occurred when applying editor template.", e));
}
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/CodeTemplateConfigurationBlock.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/CodeTemplateConfigurationBlock.java
index 9229171..23d7538 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/CodeTemplateConfigurationBlock.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/CodeTemplateConfigurationBlock.java
@@ -14,6 +14,8 @@
package org.eclipse.statet.ltk.ui.templates.config;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -79,7 +81,6 @@
import org.eclipse.statet.ecommons.ui.util.LayoutUtils;
import org.eclipse.statet.ecommons.ui.viewers.ViewerUtils;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
import org.eclipse.statet.internal.ltk.ui.TemplatesMessages;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditorViewerConfigurator;
import org.eclipse.statet.ltk.ui.templates.TemplatePreview;
@@ -958,12 +959,12 @@
/* Error Dialogs **************************************************************/
private void openReadErrorDialog(final Exception e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID, 0,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID, 0,
TemplatesMessages.Config_error_Read_message, e), StatusManager.LOG | StatusManager.SHOW);
}
private void openWriteErrorDialog(final Exception e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID, 0,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID, 0,
TemplatesMessages.Config_error_Write_message, e), StatusManager.LOG | StatusManager.SHOW);
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/EditTemplateDialog.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/EditTemplateDialog.java
index f2f2daa..15e8959 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/EditTemplateDialog.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/EditTemplateDialog.java
@@ -63,7 +63,7 @@
import org.eclipse.statet.ecommons.ui.viewers.ViewerUtils;
import org.eclipse.statet.internal.ltk.ui.EditingMessages;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
+import org.eclipse.statet.internal.ltk.ui.LtkUIPlugin;
import org.eclipse.statet.ltk.ui.sourceediting.SnippetEditor;
import org.eclipse.statet.ltk.ui.sourceediting.SnippetEditor1;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditorViewerConfigurator;
@@ -454,7 +454,7 @@
protected IDialogSettings getDialogSettings() {
- return DialogUtils.getDialogSettings(LTKUIPlugin.getInstance(), "TemplateEditDialog"); //$NON-NLS-1$
+ return DialogUtils.getDialogSettings(LtkUIPlugin.getInstance(), "TemplateEditDialog"); //$NON-NLS-1$
}
@Override
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/RegistryTemplateCategory.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/RegistryTemplateCategory.java
index 24cf9b8..60f7097 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/RegistryTemplateCategory.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/RegistryTemplateCategory.java
@@ -14,6 +14,8 @@
package org.eclipse.statet.ltk.ui.templates.config;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IStatus;
@@ -22,8 +24,6 @@
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.statushandlers.StatusManager;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
-
class RegistryTemplateCategory extends TemplateCategory {
@@ -50,7 +50,7 @@
setConfiguration(configuration);
}
catch (final CoreException e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID, 0,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID, 0,
NLS.bind("An error occurred when loading template category configuration for category {0} of plugin ''{1}''",
getId(),
this.extElement.getContributor().getName() ),
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/TemplateConfigUI.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/TemplateConfigUI.java
index e14d6b1..f4e333b 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/TemplateConfigUI.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/config/TemplateConfigUI.java
@@ -14,13 +14,16 @@
package org.eclipse.statet.ltk.ui.templates.config;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
+import org.eclipse.statet.jcommons.lang.NonNullByDefault;
+@NonNullByDefault
public class TemplateConfigUI {
- public static final String PREF_QUALIFIER= LTKUIPlugin.BUNDLE_ID + "/templates/config"; //$NON-NLS-1$
+ public static final String PREF_QUALIFIER= BUNDLE_ID + "/templates/config"; //$NON-NLS-1$
private TemplateConfigUI() {}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/wizards/NewElementWizard.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/wizards/NewElementWizard.java
index 8fe6aa7..79b7b0b 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/wizards/NewElementWizard.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/wizards/NewElementWizard.java
@@ -14,6 +14,8 @@
package org.eclipse.statet.ltk.ui.wizards;
+import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
+
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
@@ -61,7 +63,6 @@
import org.eclipse.statet.ecommons.ui.util.UIAccess;
-import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
import org.eclipse.statet.ltk.ui.util.LTKWorkbenchUIUtil;
@@ -553,7 +554,7 @@
}
protected void handleTasksException(final Shell shell, final InvocationTargetException e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, LTKUIPlugin.BUNDLE_ID, -1,
+ StatusManager.getManager().handle(new Status(IStatus.ERROR, BUNDLE_ID, -1,
LTKWizardsMessages.NewElement_error_DuringOperation_message, e),
StatusManager.LOG | StatusManager.SHOW);
}
