Skip to content
This repository has been archived by the owner on Apr 3, 2018. It is now read-only.

Commit

Permalink
LANG: Moves and renames, made naming more consistent
Browse files Browse the repository at this point in the history
  • Loading branch information
@bruno-medeiros
bruno-medeiros committed Oct 30, 2015
1 parent d91c7c0 commit c1042f7
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 79 deletions.
4 changes: 2 additions & 2 deletions ...erences/LangEditorConfigurationBlock.java → ...preferences/EditorConfigurationBlock.java
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
import melnorme.lang.ide.ui.preferences.common.AbstractPreferencesBlock; import melnorme.lang.ide.ui.preferences.common.AbstractPreferencesBlock;
import melnorme.util.swt.components.fields.CheckBoxField; import melnorme.util.swt.components.fields.CheckBoxField;


public class LangEditorConfigurationBlock extends AbstractPreferencesBlock { public class EditorConfigurationBlock extends AbstractPreferencesBlock {


protected final IPreferenceStore store; // TODO: remove protected final IPreferenceStore store; // TODO: remove


public LangEditorConfigurationBlock(IPreferenceStore store) { public EditorConfigurationBlock(IPreferenceStore store) {
super(); super();
this.store = assertNotNull(store); this.store = assertNotNull(store);
} }
Expand Down
4 changes: 2 additions & 2 deletions ...ditorContentAssistConfigurationBlock.java → ...ditorContentAssistConfigurationBlock.java
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
import melnorme.lang.ide.ui.preferences.common.AbstractPreferencesBlock; import melnorme.lang.ide.ui.preferences.common.AbstractPreferencesBlock;
import melnorme.util.swt.components.fields.CheckBoxField; import melnorme.util.swt.components.fields.CheckBoxField;


public class LangEditorContentAssistConfigurationBlock extends AbstractPreferencesBlock { public class EditorContentAssistConfigurationBlock extends AbstractPreferencesBlock {


public LangEditorContentAssistConfigurationBlock() { public EditorContentAssistConfigurationBlock() {
super(); super();
} }


Expand Down
4 changes: 2 additions & 2 deletions ...s/LangEditorTypingConfigurationBlock.java → ...ences/EditorTypingConfigurationBlock.java
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
import melnorme.utilbox.core.DevelopmentCodeMarkers; import melnorme.utilbox.core.DevelopmentCodeMarkers;
import melnorme.utilbox.fields.IFieldValueListener; import melnorme.utilbox.fields.IFieldValueListener;


public class LangEditorTypingConfigurationBlock extends AbstractPreferencesBlock { public class EditorTypingConfigurationBlock extends AbstractPreferencesBlock {


public LangEditorTypingConfigurationBlock() { public EditorTypingConfigurationBlock() {
super(); super();
} }


Expand Down
7 changes: 3 additions & 4 deletions ...ngProjectBuildConfigurationComponent.java → ...s/ProjectBuildConfigurationComponent.java
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
*******************************************************************************/ *******************************************************************************/
package melnorme.lang.ide.ui.preferences; package melnorme.lang.ide.ui.preferences;



import java.util.Map.Entry; import java.util.Map.Entry;


import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
Expand All @@ -36,7 +35,7 @@
import melnorme.utilbox.collections.HashMap2; import melnorme.utilbox.collections.HashMap2;
import melnorme.utilbox.core.CommonException; import melnorme.utilbox.core.CommonException;


public abstract class LangProjectBuildConfigurationComponent extends AbstractValidatedBlockExt public class ProjectBuildConfigurationComponent extends AbstractValidatedBlockExt
implements IPreferencesWidget { implements IPreferencesWidget {


protected final IProject project; protected final IProject project;
Expand All @@ -46,7 +45,7 @@ public abstract class LangProjectBuildConfigurationComponent extends AbstractVal
protected final HashMap2<String, BuildTargetData> buildOptionsToChange = new HashMap2<>(); protected final HashMap2<String, BuildTargetData> buildOptionsToChange = new HashMap2<>();
protected BuildTargetData buildTargetData = new BuildTargetData(); protected BuildTargetData buildTargetData = new BuildTargetData();


public LangProjectBuildConfigurationComponent(IProject project) { public ProjectBuildConfigurationComponent(IProject project) {
this.project = project; this.project = project;
initialize(); initialize();
} }
Expand Down Expand Up @@ -131,7 +130,7 @@ public String getProjectName() throws CommonException {


@Override @Override
public String getBuildTargetName() { public String getBuildTargetName() {
return LangProjectBuildConfigurationComponent.this.getBuildTargetName(); return ProjectBuildConfigurationComponent.this.getBuildTargetName();
} }


@Override @Override
Expand Down
15 changes: 8 additions & 7 deletions ...s/LangBuildConfigurationPropertyPage.java → ...pages/BuildConfigurationPropertyPage.java
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -8,28 +8,29 @@
* Contributors: * Contributors:
* Bruno Medeiros - initial API and implementation * 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 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(); super();
noDefaultAndApplyButton(); noDefaultAndApplyButton();
} }


/* ----------------- ----------------- */ /* ----------------- ----------------- */


@Override @Override
protected abstract LangProjectBuildConfigurationComponent createProjectConfigWidget(IProject project); protected abstract ProjectBuildConfigurationComponent createProjectConfigWidget(IProject project);


@Override @Override
public LangProjectBuildConfigurationComponent getPreferencesWidget() { public ProjectBuildConfigurationComponent getPreferencesWidget() {
return (LangProjectBuildConfigurationComponent) super.getPreferencesWidget(); return (ProjectBuildConfigurationComponent) super.getPreferencesWidget();
} }


@Override @Override
Expand Down
6 changes: 3 additions & 3 deletions .../ui/tools/AbstractDeamonToolPrefPage.java → ...ences/pages/DaemonToolPreferencePage.java
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Contributors: * Contributors:
* Bruno Medeiros - initial API and implementation * 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.jface.layout.GridDataFactory;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
Expand All @@ -29,9 +29,9 @@
import melnorme.util.swt.components.fields.CheckBoxField; import melnorme.util.swt.components.fields.CheckBoxField;
import melnorme.util.swt.components.fields.FileTextField; import melnorme.util.swt.components.fields.FileTextField;


public abstract class AbstractDeamonToolPrefPage extends AbstractPreferencesBlockPrefPage { public abstract class DaemonToolPreferencePage extends AbstractPreferencesBlockPrefPage {


public AbstractDeamonToolPrefPage() { public DaemonToolPreferencePage() {
} }


@Override @Override
Expand Down
11 changes: 6 additions & 5 deletions ...ences/LangEditorTypingPreferencePage.java → ...ces/pages/EditorTypingPreferencePage.java
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -8,20 +8,21 @@
* Contributors: * Contributors:
* Bruno Medeiros - initial API and implementation * 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; 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(); super();
} }


@Override @Override
protected LangEditorTypingConfigurationBlock init_createPreferencesBlock() { protected EditorTypingConfigurationBlock init_createPreferencesBlock() {
return new LangEditorTypingConfigurationBlock(); return new EditorTypingConfigurationBlock();
} }


@Override @Override
Expand Down
12 changes: 9 additions & 3 deletions ...i/preferences/LangRootPreferencePage.java → ...preferences/pages/RootPreferencePage.java
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -8,17 +8,23 @@
* Contributors: * Contributors:
* Bruno Medeiros - initial API and implementation * 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; 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(); super();
} }


@Override
protected String getHelpId() {
return null;
}

@Override @Override
protected LangSDKConfigBlock init_createPreferencesBlock() { protected LangSDKConfigBlock init_createPreferencesBlock() {
return init_createLangSDKConfigBlock(); return init_createLangSDKConfigBlock();
Expand Down
51 changes: 0 additions & 51 deletions plugin_ide.ui/src/LANG_PROJECT_ID/ide/ui/preferences/SourceColoringConfigurationBlock.java
View file

This file was deleted.

0 comments on commit c1042f7

Please sign in to comment.