LANG: Moves and renames, made naming more consistent

GoClipse · Oct 30, 2015 · c1042f7 · c1042f7
1 parent d91c7c0
commit c1042f7
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 79 deletions.
diff --git a/...erences/LangEditorConfigurationBlock.java → ...preferences/EditorConfigurationBlock.java b/...erences/LangEditorConfigurationBlock.java → ...preferences/EditorConfigurationBlock.java
@@ -24,11 +24,11 @@
 import melnorme.lang.ide.ui.preferences.common.AbstractPreferencesBlock;
 import melnorme.util.swt.components.fields.CheckBoxField;
 
-public class LangEditorConfigurationBlock extends AbstractPreferencesBlock {
+public class EditorConfigurationBlock extends AbstractPreferencesBlock {
 
 	protected final IPreferenceStore store; // TODO: remove
 
-	public LangEditorConfigurationBlock(IPreferenceStore store) {
+	public EditorConfigurationBlock(IPreferenceStore store) {
 		super();
 		this.store = assertNotNull(store);
 	}

diff --git a/...ditorContentAssistConfigurationBlock.java → ...ditorContentAssistConfigurationBlock.java b/...ditorContentAssistConfigurationBlock.java → ...ditorContentAssistConfigurationBlock.java
@@ -16,9 +16,9 @@
 import melnorme.lang.ide.ui.preferences.common.AbstractPreferencesBlock;
 import melnorme.util.swt.components.fields.CheckBoxField;
 
-public class LangEditorContentAssistConfigurationBlock extends AbstractPreferencesBlock {
+public class EditorContentAssistConfigurationBlock extends AbstractPreferencesBlock {
 
-	public LangEditorContentAssistConfigurationBlock() {
+	public EditorContentAssistConfigurationBlock() {
 		super();
 	}
 

diff --git a/...s/LangEditorTypingConfigurationBlock.java → ...ences/EditorTypingConfigurationBlock.java b/...s/LangEditorTypingConfigurationBlock.java → ...ences/EditorTypingConfigurationBlock.java
@@ -25,9 +25,9 @@
 import melnorme.utilbox.core.DevelopmentCodeMarkers;
 import melnorme.utilbox.fields.IFieldValueListener;
 
-public class LangEditorTypingConfigurationBlock extends AbstractPreferencesBlock {
+public class EditorTypingConfigurationBlock extends AbstractPreferencesBlock {
 
-	public LangEditorTypingConfigurationBlock() {
+	public EditorTypingConfigurationBlock() {
 		super();
 	}
 

diff --git a/...ngProjectBuildConfigurationComponent.java → ...s/ProjectBuildConfigurationComponent.java b/...ngProjectBuildConfigurationComponent.java → ...s/ProjectBuildConfigurationComponent.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package melnorme.lang.ide.ui.preferences;
 
-
 import java.util.Map.Entry;
 
 import org.eclipse.core.resources.IProject;
@@ -36,7 +35,7 @@
 import melnorme.utilbox.collections.HashMap2;
 import melnorme.utilbox.core.CommonException;
 
-public abstract class LangProjectBuildConfigurationComponent extends AbstractValidatedBlockExt 
+public class ProjectBuildConfigurationComponent extends AbstractValidatedBlockExt 
 	implements IPreferencesWidget {
 
 	protected final IProject project;
@@ -46,7 +45,7 @@ public abstract class LangProjectBuildConfigurationComponent extends AbstractVal
 	protected final HashMap2<String, BuildTargetData> buildOptionsToChange = new HashMap2<>();
 	protected BuildTargetData buildTargetData = new BuildTargetData();
 
-	public LangProjectBuildConfigurationComponent(IProject project) {
+	public ProjectBuildConfigurationComponent(IProject project) {
 		this.project = project;
 		initialize();
 	}
@@ -131,7 +130,7 @@ public String getProjectName() throws CommonException {
 
 			@Override
 			public String getBuildTargetName() {
-				return LangProjectBuildConfigurationComponent.this.getBuildTargetName();
+				return ProjectBuildConfigurationComponent.this.getBuildTargetName();
 			}
 
 			@Override

diff --git a/...s/LangBuildConfigurationPropertyPage.java → ...pages/BuildConfigurationPropertyPage.java b/...s/LangBuildConfigurationPropertyPage.java → ...pages/BuildConfigurationPropertyPage.java
@@ -8,28 +8,29 @@
  * Contributors:
  *     Bruno Medeiros - initial API and implementation
  *******************************************************************************/
-package melnorme.lang.ide.ui.dialogs;
+package melnorme.lang.ide.ui.preferences.pages;
 
 
 import org.eclipse.core.resources.IProject;
 
-import melnorme.lang.ide.ui.preferences.LangProjectBuildConfigurationComponent;
+import melnorme.lang.ide.ui.dialogs.AbstractLangPropertyPage;
+import melnorme.lang.ide.ui.preferences.ProjectBuildConfigurationComponent;
 
-public abstract class LangBuildConfigurationPropertyPage extends AbstractLangPropertyPage {
+public abstract class BuildConfigurationPropertyPage extends AbstractLangPropertyPage {
 
-	public LangBuildConfigurationPropertyPage() {
+	public BuildConfigurationPropertyPage() {
 		super();
 		noDefaultAndApplyButton();
 	}
 
 	/* -----------------  ----------------- */
 
 	@Override
-	protected abstract LangProjectBuildConfigurationComponent createProjectConfigWidget(IProject project);
+	protected abstract ProjectBuildConfigurationComponent createProjectConfigWidget(IProject project);
 
 	@Override
-	public LangProjectBuildConfigurationComponent getPreferencesWidget() {
-		return (LangProjectBuildConfigurationComponent) super.getPreferencesWidget();
+	public ProjectBuildConfigurationComponent getPreferencesWidget() {
+		return (ProjectBuildConfigurationComponent) super.getPreferencesWidget();
 	}
 
 	@Override

diff --git a/.../ui/tools/AbstractDeamonToolPrefPage.java → ...ences/pages/DaemonToolPreferencePage.java b/.../ui/tools/AbstractDeamonToolPrefPage.java → ...ences/pages/DaemonToolPreferencePage.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Bruno Medeiros - initial API and implementation
  *******************************************************************************/
-package melnorme.lang.ide.ui.tools;
+package melnorme.lang.ide.ui.preferences.pages;
 
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.swt.SWT;
@@ -29,9 +29,9 @@
 import melnorme.util.swt.components.fields.CheckBoxField;
 import melnorme.util.swt.components.fields.FileTextField;
 
-public abstract class AbstractDeamonToolPrefPage extends AbstractPreferencesBlockPrefPage {
+public abstract class DaemonToolPreferencePage extends AbstractPreferencesBlockPrefPage {
 
-	public AbstractDeamonToolPrefPage() {
+	public DaemonToolPreferencePage() {
 	}
 
 	@Override

diff --git a/...ences/LangEditorTypingPreferencePage.java → ...ces/pages/EditorTypingPreferencePage.java b/...ences/LangEditorTypingPreferencePage.java → ...ces/pages/EditorTypingPreferencePage.java
@@ -8,20 +8,21 @@
  * Contributors:
  *     Bruno Medeiros - initial API and implementation
  *******************************************************************************/
-package melnorme.lang.ide.ui.preferences;
+package melnorme.lang.ide.ui.preferences.pages;
 
 
+import melnorme.lang.ide.ui.preferences.EditorTypingConfigurationBlock;
 import melnorme.lang.ide.ui.preferences.common.AbstractPreferencesBlockPrefPage;
 
-public abstract class LangEditorTypingPreferencePage extends AbstractPreferencesBlockPrefPage {
+public abstract class EditorTypingPreferencePage extends AbstractPreferencesBlockPrefPage {
 
-	public LangEditorTypingPreferencePage() {
+	public EditorTypingPreferencePage() {
 		super();
 	}
 
 	@Override
-	protected LangEditorTypingConfigurationBlock init_createPreferencesBlock() {
-		return new LangEditorTypingConfigurationBlock();
+	protected EditorTypingConfigurationBlock init_createPreferencesBlock() {
+		return new EditorTypingConfigurationBlock();
 	}
 
 	@Override

diff --git a/...i/preferences/LangRootPreferencePage.java → ...preferences/pages/RootPreferencePage.java b/...i/preferences/LangRootPreferencePage.java → ...preferences/pages/RootPreferencePage.java
@@ -8,17 +8,23 @@
  * Contributors:
  *     Bruno Medeiros - initial API and implementation
  *******************************************************************************/
-package melnorme.lang.ide.ui.preferences;
+package melnorme.lang.ide.ui.preferences.pages;
 
 
+import melnorme.lang.ide.ui.preferences.LangSDKConfigBlock;
 import melnorme.lang.ide.ui.preferences.common.AbstractPreferencesBlockPrefPage;
 
-public abstract class LangRootPreferencePage extends AbstractPreferencesBlockPrefPage {
+public abstract class RootPreferencePage extends AbstractPreferencesBlockPrefPage {
 
-	public LangRootPreferencePage() {
+	public RootPreferencePage() {
 		super();
 	}
 
+	@Override
+	protected String getHelpId() {
+		return null;
+	}
+
 	@Override
 	protected LangSDKConfigBlock init_createPreferencesBlock() {
 		return init_createLangSDKConfigBlock();

diff --git a/plugin_ide.ui/src/LANG_PROJECT_ID/ide/ui/preferences/SourceColoringConfigurationBlock.java b/plugin_ide.ui/src/LANG_PROJECT_ID/ide/ui/preferences/SourceColoringConfigurationBlock.java