diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/IAutotoolsMarker.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/IAutotoolsMarker.java index a85a55e344f..d52d4f9761c 100644 --- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/IAutotoolsMarker.java +++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/IAutotoolsMarker.java @@ -13,9 +13,9 @@ package org.eclipse.cdt.internal.autotools.core; import org.eclipse.cdt.autotools.core.AutotoolsPlugin; public interface IAutotoolsMarker { - public static String AUTOTOOLS_PROBLEM_MARKER = AutotoolsPlugin.PLUGIN_ID + ".problem"; //$NON-NLS-1$ - public static final String MARKER_VARIABLE = "problem.variable"; //$NON-NLS-1$ - public static final String MARKER_EXTERNAL_LOCATION = "problem.externalLocation"; //$NON-NLS-1$ - public static final String MARKER_LIBRARY_INFO="problem.libraryInfo"; //$NON-NLS-1$ - public static final String MARKER_PROBLEM_TYPE="problem.type"; //$NON-NLS-1$ + String AUTOTOOLS_PROBLEM_MARKER = AutotoolsPlugin.PLUGIN_ID + ".problem"; //$NON-NLS-1$ + String MARKER_VARIABLE = "problem.variable"; //$NON-NLS-1$ + String MARKER_EXTERNAL_LOCATION = "problem.externalLocation"; //$NON-NLS-1$ + String MARKER_LIBRARY_INFO = "problem.libraryInfo"; //$NON-NLS-1$ + String MARKER_PROBLEM_TYPE = "problem.type"; //$NON-NLS-1$ } diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/IConfigurationCloneListener.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/IConfigurationCloneListener.java index 60d7b9611c6..e98b8b18e4e 100644 --- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/IConfigurationCloneListener.java +++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/IConfigurationCloneListener.java @@ -8,5 +8,5 @@ public interface IConfigurationCloneListener { * @param cloneName - name of the cloned configuration * @param c - the clone */ - public void cloneCfg(String cloneName, IConfiguration c); + void cloneCfg(String cloneName, IConfiguration c); } diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/IAConfiguration.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/IAConfiguration.java index f71e1ee0abf..01b35e332b8 100644 --- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/IAConfiguration.java +++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/IAConfiguration.java @@ -14,17 +14,29 @@ import java.util.ArrayList; import java.util.Map; public interface IAConfiguration { - public IConfigureOption getOption(String name); - public String getId(); - public boolean isDirty(); - public void setDirty(boolean value); - public Map getOptions(); - public String getToolParameters(String name); - public ArrayList getToolArgs(String name); - public void setOption(String name, String value); - public void setConfigToolDirectory(String configToolDirectory); - public String getConfigToolDirectory(); - public IAConfiguration copy(); - public IAConfiguration copy(String id); - public void setDefaultOptions(); + IConfigureOption getOption(String name); + + String getId(); + + boolean isDirty(); + + void setDirty(boolean value); + + Map getOptions(); + + String getToolParameters(String name); + + ArrayList getToolArgs(String name); + + void setOption(String name, String value); + + void setConfigToolDirectory(String configToolDirectory); + + String getConfigToolDirectory(); + + IAConfiguration copy(); + + IAConfiguration copy(String id); + + void setDefaultOptions(); } diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/IConfigureOption.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/IConfigureOption.java index 07b709094df..10adc1092e4 100644 --- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/IConfigureOption.java +++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/IConfigureOption.java @@ -16,26 +16,40 @@ import org.eclipse.cdt.autotools.core.IAutotoolsOption; public interface IConfigureOption { - public final static int CATEGORY = IAutotoolsOption.CATEGORY; - public final static int BIN = IAutotoolsOption.BIN; - public final static int STRING = IAutotoolsOption.STRING; - public final static int INTERNAL = IAutotoolsOption.INTERNAL; - public final static int MULTIARG = IAutotoolsOption.MULTIARG; - public final static int TOOL = IAutotoolsOption.TOOL; - public final static int FLAG = IAutotoolsOption.FLAG; - public final static int FLAGVALUE = IAutotoolsOption.FLAGVALUE; - public String getName(); - public String getParameter(); - public ArrayList getParameters(); - public boolean isParmSet(); - public String getDescription(); - public String getToolTip(); - public void setValue(String value); - public IConfigureOption copy(AutotoolsConfiguration cfg); - public String getValue(); - public boolean isCategory(); - public boolean isMultiArg(); - public boolean isFlag(); - public boolean isFlagValue(); - public int getType(); + int CATEGORY = IAutotoolsOption.CATEGORY; + int BIN = IAutotoolsOption.BIN; + int STRING = IAutotoolsOption.STRING; + int INTERNAL = IAutotoolsOption.INTERNAL; + int MULTIARG = IAutotoolsOption.MULTIARG; + int TOOL = IAutotoolsOption.TOOL; + int FLAG = IAutotoolsOption.FLAG; + int FLAGVALUE = IAutotoolsOption.FLAGVALUE; + + String getName(); + + String getParameter(); + + ArrayList getParameters(); + + boolean isParmSet(); + + String getDescription(); + + String getToolTip(); + + void setValue(String value); + + IConfigureOption copy(AutotoolsConfiguration cfg); + + String getValue(); + + boolean isCategory(); + + boolean isMultiArg(); + + boolean isFlag(); + + boolean isFlagValue(); + + int getType(); } diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java index c45d8a5b342..54fbe62b84b 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java @@ -13,5 +13,5 @@ package org.eclipse.cdt.autotools.ui.editors; import org.eclipse.cdt.autotools.ui.AutotoolsUIPlugin; public interface IAutotoolEditorActionDefinitionIds { - public static final String SHOW_TOOLTIP = AutotoolsUIPlugin.getUniqueIdentifier() + ".editors.text.show.tooltip"; //$NON-NLS-1$ + String SHOW_TOOLTIP = AutotoolsUIPlugin.getUniqueIdentifier() + ".editors.text.show.tooltip"; //$NON-NLS-1$ } diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java index 92a8c462dc6..76d8dab4729 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java @@ -13,8 +13,8 @@ package org.eclipse.cdt.autotools.ui.editors; import org.eclipse.cdt.autotools.ui.AutotoolsUIPlugin; public interface IAutotoolHelpContextIds { - public static final String PREFIX = AutotoolsUIPlugin.getUniqueIdentifier(); - public static final String AC_EDITOR_VIEW = PREFIX + "autoconf_editor"; //$NON-NLS-1$ - public static final String SHOW_TOOLTIP_ACTION = PREFIX + "show_tooltip_action"; //$NON-NLS-1$ - public static final String CONTENT_ASSIST = PREFIX + "content_assist"; //$NON-NLS-1$ + String PREFIX = AutotoolsUIPlugin.getUniqueIdentifier(); + String AC_EDITOR_VIEW = PREFIX + "autoconf_editor"; //$NON-NLS-1$ + String SHOW_TOOLTIP_ACTION = PREFIX + "show_tooltip_action"; //$NON-NLS-1$ + String CONTENT_ASSIST = PREFIX + "content_assist"; //$NON-NLS-1$ } diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/IAutotoolsEditor.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/IAutotoolsEditor.java index d71a4c638e0..48dc0a545f5 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/IAutotoolsEditor.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/IAutotoolsEditor.java @@ -12,5 +12,5 @@ public interface IAutotoolsEditor extends ITextEditor { * * @param listener The reconcile listener to be added */ - public void addReconcilingParticipant(IReconcilingParticipant listener); + void addReconcilingParticipant(IReconcilingParticipant listener); } diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/ITokenConstants.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/ITokenConstants.java index 53c616d2e15..3390d351027 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/ITokenConstants.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/ITokenConstants.java @@ -3,85 +3,85 @@ package org.eclipse.cdt.autotools.ui.editors.parser; public interface ITokenConstants { /** end of file */ - public static final int EOF = 0; + int EOF = 0; /** end of line */ - public static final int EOL = 1; + int EOL = 1; /** an open parenthesis */ - public static final int LPAREN = 2; + int LPAREN = 2; /** a close parenthesis */ - public static final int RPAREN = 3; + int RPAREN = 3; /** a comma */ - public static final int COMMA = 4; + int COMMA = 4; /** a semicolon */ - public static final int SEMI = 5; + int SEMI = 5; /** a word (either m4 word or shell identifier-looking word) */ - public static final int WORD = 6; + int WORD = 6; /** other text (usually punctuation or number, one char at a time) */ - public static final int TEXT = 7; + int TEXT = 7; /** an m4 string (the text does not contain the outermost quotes) */ - public static final int M4_STRING = 21; + int M4_STRING = 21; /** an m4 comment (as determined by changecomment, NOT dnl) */ - public static final int M4_COMMENT = 22; + int M4_COMMENT = 22; /** the sh 'if' token */ - public static final int SH_IF = 40; + int SH_IF = 40; /** the sh 'then' token */ - public static final int SH_THEN = 41; + int SH_THEN = 41; /** the sh 'else' token */ - public static final int SH_ELSE = 42; + int SH_ELSE = 42; /** the sh 'elif' token */ - public static final int SH_ELIF = 43; + int SH_ELIF = 43; /** the sh 'fi' token */ - public static final int SH_FI = 44; + int SH_FI = 44; /** the sh 'while' token */ - public static final int SH_WHILE = 45; + int SH_WHILE = 45; /** the sh 'for' token */ - public static final int SH_FOR = 46; + int SH_FOR = 46; /** the sh 'select' token */ - public static final int SH_SELECT = 47; + int SH_SELECT = 47; /** the sh 'until' token */ - public static final int SH_UNTIL = 48; + int SH_UNTIL = 48; /** the sh 'do' token */ - public static final int SH_DO = 49; + int SH_DO = 49; /** the sh 'done' token */ - public static final int SH_DONE = 50; + int SH_DONE = 50; /** the sh 'case' token */ - public static final int SH_CASE = 51; + int SH_CASE = 51; /** the sh 'in' token */ - public static final int SH_IN = 52; + int SH_IN = 52; /** the sh ';;' token */ - public static final int SH_CASE_CONDITION_END = 53; + int SH_CASE_CONDITION_END = 53; /** the sh 'esac' token */ - public static final int SH_ESAC = 54; + int SH_ESAC = 54; /** the sh '$' token */ - public static final int SH_DOLLAR = 60; + int SH_DOLLAR = 60; /** the sh '{' token */ - public static final int SH_LBRACE = 61; + int SH_LBRACE = 61; /** the sh '}' token */ - public static final int SH_RBRACE = 62; + int SH_RBRACE = 62; /** the sh '[' token */ - public static final int SH_LBRACKET = 63; + int SH_LBRACKET = 63; /** the sh ']' token */ - public static final int SH_RBRACKET = 64; + int SH_RBRACKET = 64; /** the sh '<<' token */ - public static final int SH_HERE = 65; + int SH_HERE = 65; /** the sh '<<-' token */ - public static final int SH_HERE_DASH = 66; + int SH_HERE_DASH = 66; /** an sh double-quoted string */ - public static final int SH_STRING_DOUBLE = 67; + int SH_STRING_DOUBLE = 67; /** an sh single-quoted string */ - public static final int SH_STRING_SINGLE = 68; + int SH_STRING_SINGLE = 68; /** an sh backtick-quoted string */ - public static final int SH_STRING_BACKTICK = 69; + int SH_STRING_BACKTICK = 69; } \ No newline at end of file diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IAutomakeConditional.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IAutomakeConditional.java index f9ecac051aa..7b259a91e9d 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IAutomakeConditional.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IAutomakeConditional.java @@ -12,8 +12,11 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; public interface IAutomakeConditional { - public boolean isAutomake(); - public void setAutomake(boolean value); - public Rule[] getRules(); - public void setRules(Rule[] rules); + boolean isAutomake(); + + void setAutomake(boolean value); + + Rule[] getRules(); + + void setRules(Rule[] rules); } diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ICommand.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ICommand.java index 2f9750b7549..c78bbb77ede 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ICommand.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ICommand.java @@ -24,19 +24,19 @@ import java.io.IOException; */ public interface ICommand extends IDirective { - final public static char HYPHEN = '-'; + char HYPHEN = '-'; - final public static String HYPHEN_STRING = "-"; //$NON-NLS-1$ + String HYPHEN_STRING = "-"; //$NON-NLS-1$ - final public static char AT = '@'; + char AT = '@'; - final public static String AT_STRING = "@"; //$NON-NLS-1$ + String AT_STRING = "@"; //$NON-NLS-1$ - final public static char PLUS = '+'; + char PLUS = '+'; - final public static String PLUS_STRING = "+"; //$NON-NLS-1$ + String PLUS_STRING = "+"; //$NON-NLS-1$ - final public static char TAB = '\t'; + char TAB = '\t'; /** * - If the command prefix contains a hyphen, or the -i option is diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IComment.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IComment.java index 2c3ecd55472..40286b48853 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IComment.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IComment.java @@ -18,8 +18,8 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; */ public interface IComment extends IDirective { - final public static char POUND = '#'; + char POUND = '#'; - final public static String POUND_STRING = "#"; //$NON-NLS-1$ + String POUND_STRING = "#"; //$NON-NLS-1$ } diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefileEditorActionDefinitionIds.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefileEditorActionDefinitionIds.java index be8a98ce622..76e09d658b8 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefileEditorActionDefinitionIds.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefileEditorActionDefinitionIds.java @@ -16,10 +16,9 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; */ public interface IMakefileEditorActionDefinitionIds { - final String UNCOMMENT = "org.eclipse.cdt.make.ui.edit.text.makefile.uncomment"; //$NON-NLS-1$ + String UNCOMMENT = "org.eclipse.cdt.make.ui.edit.text.makefile.uncomment"; //$NON-NLS-1$ + String COMMENT = "org.eclipse.cdt.make.ui.edit.text.makefile.comment"; //$NON-NLS-1$ - final String COMMENT = "org.eclipse.cdt.make.ui.edit.text.makefile.comment"; //$NON-NLS-1$ - - final String OPEN_DECLARATION = "org.eclipse.cdt.make.ui.edit.text.makefile.opendcl"; //$NON-NLS-1$ + String OPEN_DECLARATION = "org.eclipse.cdt.make.ui.edit.text.makefile.opendcl"; //$NON-NLS-1$ } diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefileValidator.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefileValidator.java index 3603db3f569..1e1cea553ac 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefileValidator.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefileValidator.java @@ -25,6 +25,7 @@ import org.eclipse.core.runtime.IProgressMonitor; * @noimplement This interface is not intended to be implemented by clients. */ public interface IMakefileValidator { - public abstract void setMarkerGenerator(IMarkerGenerator errorHandler); - public abstract void checkFile(IFile file, IProgressMonitor monitor); + void setMarkerGenerator(IMarkerGenerator errorHandler); + + void checkFile(IFile file, IProgressMonitor monitor); }