diff options
49 files changed, 224 insertions, 225 deletions
diff --git a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchAdvisor.java b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchAdvisor.java index 6f182dfd7..80cdfb896 100644 --- a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchAdvisor.java +++ b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchAdvisor.java @@ -89,51 +89,51 @@ public class JubulaWorkbenchAdvisor extends WorkbenchAdvisor { configurer.setSaveAndRestore(true);
// To get the icons for projects correctly registered
- final String iconsPath = "icons/full/";
- final String pathObject = iconsPath + "obj16/";
- final String problemsViewPath = iconsPath + "etool16/";
- final String elclPath = iconsPath + "elcl16/";
- final String dlclPath = iconsPath + "dlcl16/";
+ final String iconsPath = "icons/full/"; //$NON-NLS-1$
+ final String pathObject = iconsPath + "obj16/"; //$NON-NLS-1$
+ final String problemsViewPath = iconsPath + "etool16/"; //$NON-NLS-1$
+ final String elclPath = iconsPath + "elcl16/"; //$NON-NLS-1$
+ final String dlclPath = iconsPath + "dlcl16/"; //$NON-NLS-1$
final String wizbanPath = iconsPath + "wizban/"; //Wizard icons //$NON-NLS-1$
Bundle ideBundle = Platform.getBundle(IDEWorkbenchPlugin.IDE_WORKBENCH);
declareWorkbenchImage(configurer, ideBundle,
IDE.SharedImages.IMG_OBJ_PROJECT,
- pathObject + "prj_obj.gif", true);
+ pathObject + "prj_obj.gif", true); //$NON-NLS-1$
declareWorkbenchImage(configurer, ideBundle,
IDE.SharedImages.IMG_OBJ_PROJECT_CLOSED,
- pathObject + "cprj_obj.gif", true);
+ pathObject + "cprj_obj.gif", true); //$NON-NLS-1$
declareWorkbenchImage(configurer, ideBundle,
IDEInternalWorkbenchImages.IMG_ETOOL_PROBLEM_CATEGORY,
- problemsViewPath + "problem_category.gif",
+ problemsViewPath + "problem_category.gif", //$NON-NLS-1$
true);
declareWorkbenchImage(configurer, ideBundle,
IDEInternalWorkbenchImages.IMG_OBJS_ERROR_PATH,
- pathObject + "error_tsk.gif",
+ pathObject + "error_tsk.gif", //$NON-NLS-1$
true);
declareWorkbenchImage(configurer, ideBundle,
IDEInternalWorkbenchImages.IMG_OBJS_WARNING_PATH,
- pathObject + "warn_tsk.gif",
+ pathObject + "warn_tsk.gif", //$NON-NLS-1$
true);
declareWorkbenchImage(configurer, ideBundle,
IDEInternalWorkbenchImages.IMG_OBJS_INFO_PATH,
- pathObject + "info_tsk.gif",
+ pathObject + "info_tsk.gif", //$NON-NLS-1$
true);
declareWorkbenchImage(configurer, ideBundle,
IDEInternalWorkbenchImages.IMG_ELCL_QUICK_FIX_ENABLED,
- elclPath + "smartmode_co.gif",
+ elclPath + "smartmode_co.gif", //$NON-NLS-1$
true);
declareWorkbenchImage(configurer, ideBundle,
IDEInternalWorkbenchImages.IMG_DLCL_QUICK_FIX_DISABLED,
- dlclPath + "smartmode_co.gif",
+ dlclPath + "smartmode_co.gif", //$NON-NLS-1$
true); declareWorkbenchImage(configurer, ideBundle, IDEInternalWorkbenchImages.IMG_DLGBAN_QUICKFIX_DLG, - wizbanPath + "quick_fix.png", + wizbanPath + "quick_fix.png", //$NON-NLS-1$ true); declareWorkbenchImage(configurer, ideBundle,
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/gui/ManualTestStepOptionPane.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/gui/ManualTestStepOptionPane.java index e2f1ba1f2..7a9b2a501 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/gui/ManualTestStepOptionPane.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/gui/ManualTestStepOptionPane.java @@ -148,19 +148,19 @@ public class ManualTestStepOptionPane extends JOptionPane { String expectedBehavior, int timeout) { if (GraphicsEnvironment.isHeadless()) { return new ManualTestStepResult( - "Test step has been skipped due to headless running mode", + "Test step has been skipped due to headless running mode", //$NON-NLS-1$ false); } StringBuilder message = new StringBuilder(); - message.append("Manual action to perform: "); + message.append("Manual action to perform: "); //$NON-NLS-1$ message.append(LINE_BREAK); message.append(actionToPerform); message.append(LINE_BREAK).append(LINE_BREAK); - message.append("Expected Behavior: "); + message.append("Expected Behavior: "); //$NON-NLS-1$ message.append(LINE_BREAK); message.append(expectedBehavior); message.append(LINE_BREAK).append(LINE_BREAK); - message.append("Comment: "); + message.append("Comment: "); //$NON-NLS-1$ return showManualTestStepDialog(message, timeout); } diff --git a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Chain.java b/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Chain.java index c15bd8ca5..edfda7f6e 100644 --- a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Chain.java +++ b/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Chain.java @@ -324,7 +324,7 @@ public class Chain implements IAnalyze { private void traverse(Object obj, NodeOperation nodeOp, String objContType) { - if (obj instanceof INodePO && objContType.equals("IExecObjContPO")) { + if (obj instanceof INodePO && objContType.equals("IExecObjContPO")) { //$NON-NLS-1$ final INodePO root = (INodePO) obj; TreeTraverser tt = new TreeTraverser(root, nodeOp, true, true) { @Override @@ -336,7 +336,7 @@ public class Chain implements IAnalyze { }; tt.traverse(true); } else if (obj instanceof INodePO - && objContType.equals("ISpecObjContPO")) { + && objContType.equals("ISpecObjContPO")) { //$NON-NLS-1$ final INodePO root = (INodePO) obj; TreeTraverser tt = new TreeTraverser(root, nodeOp, true, true) { @Override @@ -347,7 +347,7 @@ public class Chain implements IAnalyze { } }; tt.traverse(true); - } else if (obj instanceof INodePO && objContType.equals("project")) { + } else if (obj instanceof INodePO && objContType.equals("project")) { //$NON-NLS-1$ final INodePO root = (INodePO) obj; TreeTraverser tt = new TreeTraverser(root, nodeOp, true, true) { @Override @@ -358,7 +358,7 @@ public class Chain implements IAnalyze { } }; tt.traverse(true); - } else if (obj instanceof INodePO && objContType.equals("")) { + } else if (obj instanceof INodePO && objContType.equals("")) { //$NON-NLS-1$ final INodePO root = (INodePO) obj; TreeTraverser tt = new TreeTraverser(root, nodeOp, true, true) { @Override @@ -390,7 +390,7 @@ public class Chain implements IAnalyze { for (ISpecTestCasePO sp : nodeOp.getSingleUsedSpecTCs()) { counter++; isParent = true; - monitor.subTask(Messages.PossibleChildren + " " + counter + "/" + monitor.subTask(Messages.PossibleChildren + " " + counter + "/" //$NON-NLS-1$ //$NON-NLS-2$ + nodeOp.getSingleUsedSpecTCs().size()); for (ISpecTestCasePO pp : nodeOp.getSingleUsedSpecTCs()) { if (pp != null && pp.getUnmodifiableNodeList().size() == 1) { diff --git a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/NumericalProjectElementCounter.java b/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/NumericalProjectElementCounter.java index ec355012a..ebb606c6f 100644 --- a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/NumericalProjectElementCounter.java +++ b/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/NumericalProjectElementCounter.java @@ -163,7 +163,7 @@ public class NumericalProjectElementCounter implements IAnalyze { .getParentProjectId(), GeneralStorage.getInstance(). getMasterSession()); } - monitor.beginTask("", workAmount); + monitor.beginTask("", workAmount); //$NON-NLS-1$ monitor.subTask(analyzeName); CountElementOperation c = new CountElementOperation(monitor); @@ -191,7 +191,7 @@ public class NumericalProjectElementCounter implements IAnalyze { private void traverse(CountElementOperation count, Object obj, String objContType) { - if (obj instanceof INodePO && objContType.equals("IExecObjContPO")) { + if (obj instanceof INodePO && objContType.equals("IExecObjContPO")) { //$NON-NLS-1$ final INodePO root = (INodePO) obj; TreeTraverser tt = new TreeTraverser(root, count, true, true) { @@ -204,7 +204,7 @@ public class NumericalProjectElementCounter implements IAnalyze { }; tt.traverse(true); } else if (obj instanceof INodePO - && objContType.equals("ISpecObjContPO")) { + && objContType.equals("ISpecObjContPO")) { //$NON-NLS-1$ final INodePO root = (INodePO) obj; @@ -219,7 +219,7 @@ public class NumericalProjectElementCounter implements IAnalyze { tt.traverse(true); } - if (obj instanceof INodePO && objContType.equals("project")) { + if (obj instanceof INodePO && objContType.equals("project")) { //$NON-NLS-1$ final INodePO root = (INodePO) obj; TreeTraverser tt = new TreeTraverser(root, count, true, true) { @@ -232,7 +232,7 @@ public class NumericalProjectElementCounter implements IAnalyze { }; tt.traverse(true); } - if (obj instanceof INodePO && objContType.equals("")) { + if (obj instanceof INodePO && objContType.equals("")) { //$NON-NLS-1$ final INodePO root = (INodePO) obj; TreeTraverser tt = new TreeTraverser(root, count, true, true) { diff --git a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Ratio.java b/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Ratio.java index efc840ce8..8e5e6100a 100644 --- a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Ratio.java +++ b/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Ratio.java @@ -174,9 +174,9 @@ public class Ratio implements IAnalyze { cap.getComponentType()); String type = StringConstants.EMPTY; - if (comp.getToolkitDesriptor().getName().equals("abstract") + if (comp.getToolkitDesriptor().getName().equals("abstract") //$NON-NLS-1$ || comp.getToolkitDesriptor().getName() - .equals("concrete") + .equals("concrete") //$NON-NLS-1$ || comp.getToolkitDesriptor().getName() .equals(StringConstants.EMPTY)) { type = Messages.General; @@ -290,9 +290,9 @@ public class Ratio implements IAnalyze { double curr = Double.parseDouble(Integer.toString(e.getValue())); double resNF = curr / d; - DecimalFormat df = new DecimalFormat("0.00"); + DecimalFormat df = new DecimalFormat("0.00"); //$NON-NLS-1$ - String resu = df.format(resNF * 100) + "%"; + String resu = df.format(resNF * 100) + "%"; //$NON-NLS-1$ result.put(e.getKey(), resu); } @@ -343,7 +343,7 @@ public class Ratio implements IAnalyze { tt.traverse(true); } - if (obj instanceof INodePO && objContType.equals("project")) { + if (obj instanceof INodePO && objContType.equals("project")) { //$NON-NLS-1$ final INodePO root = (INodePO) obj; TreeTraverser tt = new TreeTraverser(root, count, true, true) { diff --git a/org.eclipse.jubula.client.analyze.ui/src/org/eclipse/jubula/client/analyze/ui/internal/Query.java b/org.eclipse.jubula.client.analyze.ui/src/org/eclipse/jubula/client/analyze/ui/internal/Query.java index be1ca7d52..8e40da50f 100644 --- a/org.eclipse.jubula.client.analyze.ui/src/org/eclipse/jubula/client/analyze/ui/internal/Query.java +++ b/org.eclipse.jubula.client.analyze.ui/src/org/eclipse/jubula/client/analyze/ui/internal/Query.java @@ -110,10 +110,10 @@ public class Query extends AbstractQuery { public String getLabel() { if (getAnalyzeRun().getAnalyzeRunList().size() == 1) { // Add the actual TimeStamp to the AnalyzeName - return getTimestamp() + ": " + return getTimestamp() + ": " //$NON-NLS-1$ + getAnalyzeRun().getAnalyzeRunList().get(0).getName(); } - return ""; + return ""; //$NON-NLS-1$ } /** * {@inheritDoc} diff --git a/org.eclipse.jubula.client.analyze.ui/src/org/eclipse/jubula/client/analyze/ui/internal/helper/ContextHelper.java b/org.eclipse.jubula.client.analyze.ui/src/org/eclipse/jubula/client/analyze/ui/internal/helper/ContextHelper.java index df2ed5066..e40c41e18 100644 --- a/org.eclipse.jubula.client.analyze.ui/src/org/eclipse/jubula/client/analyze/ui/internal/helper/ContextHelper.java +++ b/org.eclipse.jubula.client.analyze.ui/src/org/eclipse/jubula/client/analyze/ui/internal/helper/ContextHelper.java @@ -52,7 +52,7 @@ public class ContextHelper { */ public static boolean isEnabled(Analyze analyze) { - ProjectContextHelper.setObjContType(""); + ProjectContextHelper.setObjContType(""); //$NON-NLS-1$ String[] contextData = contextDataToArray(analyze.getContextType()); for (Map.Entry<String, Context> c : ExtensionRegistry.getContexts() @@ -63,7 +63,7 @@ public class ContextHelper { // check if the Element is the Context of the given Analyze if (contextData[i].equals(context.getID()) - && !(context.getID().equals("projectloaded"))) { + && !(context.getID().equals("projectloaded"))) { //$NON-NLS-1$ IContext iCon = (IContext) context.getContextInstance(); @@ -85,13 +85,13 @@ public class ContextHelper { setSelection(GeneralStorage. getInstance().getProject()); ProjectContextHelper. - setObjContType("IExecObjContPO"); + setObjContType("IExecObjContPO"); //$NON-NLS-1$ } else if (structuredSel.getFirstElement() instanceof ISpecObjContPO) { setSelection(GeneralStorage. getInstance().getProject()); ProjectContextHelper. - setObjContType("ISpecObjContPO"); + setObjContType("ISpecObjContPO"); //$NON-NLS-1$ } else { setSelection(structuredSel.getFirstElement()); } @@ -126,12 +126,12 @@ public class ContextHelper { for (int i = 0; i < contextData.length; i++) { // check if the Context of the given Analyze is "projectLoaded" - if (contextData[i].equals("projectloaded") - && context.getID().equals("projectloaded")) { + if (contextData[i].equals("projectloaded") //$NON-NLS-1$ + && context.getID().equals("projectloaded")) { //$NON-NLS-1$ if (GeneralStorage.getInstance().getProject() != null) { - ProjectContextHelper.setObjContType("project"); + ProjectContextHelper.setObjContType("project"); //$NON-NLS-1$ setSelection(GeneralStorage.getInstance().getProject()); if (iCon.isActive(getSelection())) { return true; @@ -153,7 +153,7 @@ public class ContextHelper { */ public static String[] contextDataToArray(String context) { - final String pattern = ","; + final String pattern = ","; //$NON-NLS-1$ Pattern p = Pattern.compile(pattern); String[] contextData = p.split(context, 0); diff --git a/org.eclipse.jubula.client.analyze.ui/src/org/eclipse/jubula/client/analyze/ui/renderer/ChainRenderer.java b/org.eclipse.jubula.client.analyze.ui/src/org/eclipse/jubula/client/analyze/ui/renderer/ChainRenderer.java index 7e3a0ddaf..eaab1a6c4 100644 --- a/org.eclipse.jubula.client.analyze.ui/src/org/eclipse/jubula/client/analyze/ui/renderer/ChainRenderer.java +++ b/org.eclipse.jubula.client.analyze.ui/src/org/eclipse/jubula/client/analyze/ui/renderer/ChainRenderer.java @@ -224,7 +224,7 @@ public class ChainRenderer implements IResultRendererUI { if (parentElement instanceof String) { String parent = (String) parentElement; - String length = parent.replace(Messages.Chainlength, ""); + String length = parent.replace(Messages.Chainlength, ""); //$NON-NLS-1$ ISpecTestCasePO[] res = new ISpecTestCasePO[getChainModel() .getParents(Integer.parseInt(length)).length]; @@ -270,7 +270,7 @@ public class ChainRenderer implements IResultRendererUI { public Object getParent(Object element) { for (List<String> list : getChainModel().getResult()) { - String prev = ""; + String prev = ""; //$NON-NLS-1$ for (Iterator<String> it = list.iterator(); it.hasNext();) { String guid = it.next(); if (prev.equals(guid)) { @@ -281,7 +281,7 @@ public class ChainRenderer implements IResultRendererUI { String[] res = new String[1]; res[0] = node.getName(); return res; - } else if (prev.equals("")) { + } else if (prev.equals("")) { //$NON-NLS-1$ String[] res = new String[1]; res[0] = Messages.Chainlength + Integer.toString(list.size()); diff --git a/org.eclipse.jubula.client.analyze/src/org/eclipse/jubula/client/analyze/ExtensionRegistry.java b/org.eclipse.jubula.client.analyze/src/org/eclipse/jubula/client/analyze/ExtensionRegistry.java index 539ba03af..66d406099 100644 --- a/org.eclipse.jubula.client.analyze/src/org/eclipse/jubula/client/analyze/ExtensionRegistry.java +++ b/org.eclipse.jubula.client.analyze/src/org/eclipse/jubula/client/analyze/ExtensionRegistry.java @@ -191,7 +191,7 @@ public class ExtensionRegistry { AnalyzeConstants.PARAM_DEFAULT_VALUE), param.getAttribute(AnalyzeConstants.PARAM_NAME), param.getAttribute(AnalyzeConstants.PARAM_DESCRIPTION), - ""); + ""); //$NON-NLS-1$ parameterList.add(anaParam); } diff --git a/org.eclipse.jubula.client.analyze/src/org/eclipse/jubula/client/analyze/constants/AnalyzeConstants.java b/org.eclipse.jubula.client.analyze/src/org/eclipse/jubula/client/analyze/constants/AnalyzeConstants.java index 1f326cec4..c1a0f12d3 100644 --- a/org.eclipse.jubula.client.analyze/src/org/eclipse/jubula/client/analyze/constants/AnalyzeConstants.java +++ b/org.eclipse.jubula.client.analyze/src/org/eclipse/jubula/client/analyze/constants/AnalyzeConstants.java @@ -84,13 +84,13 @@ public class AnalyzeConstants { * Constants for the Category-Element in the Extension */ /** The Category */ - public static final String CATEGORY = "Category"; //$NON-NLS-1 + public static final String CATEGORY = "Category"; //NON-NLS-1$ //$NON-NLS-1$ /** The id */ - public static final String CATEGORY_ID = "id"; //$NON-NLS-1 + public static final String CATEGORY_ID = "id"; //NON-NLS-1$ //$NON-NLS-1$ /** The name */ - public static final String CATEGORY_NAME = "name"; //$NON-NLS-1 + public static final String CATEGORY_NAME = "name"; //NON-NLS-1$ //$NON-NLS-1$ /** The id of the topLevelCategory */ - public static final String CATEGORY_TOP_CAT_ID = "categoryid"; //$NON-NLS-1 + public static final String CATEGORY_TOP_CAT_ID = "categoryid"; //NON-NLS-1$ //$NON-NLS-1$ /** * Empty constructor diff --git a/org.eclipse.jubula.client.analyze/src/org/eclipse/jubula/client/analyze/internal/AnalyzeResult.java b/org.eclipse.jubula.client.analyze/src/org/eclipse/jubula/client/analyze/internal/AnalyzeResult.java index 2b67f2aa6..29e0934c9 100644 --- a/org.eclipse.jubula.client.analyze/src/org/eclipse/jubula/client/analyze/internal/AnalyzeResult.java +++ b/org.eclipse.jubula.client.analyze/src/org/eclipse/jubula/client/analyze/internal/AnalyzeResult.java @@ -24,16 +24,16 @@ public class AnalyzeResult { /** * ResultType identifier for the Renderer selection in the ResultRendererHandler */ - private String m_rType = ""; + private String m_rType = ""; //$NON-NLS-1$ /** Analyze ID */ - private String m_analyzeID = ""; + private String m_analyzeID = ""; //$NON-NLS-1$ /** CategoryID */ - private String m_catID = ""; + private String m_catID = ""; //$NON-NLS-1$ /** ContextType */ - private String m_context = ""; + private String m_context = ""; //$NON-NLS-1$ /** The result-Object */ private Object m_analyzeResult; diff --git a/org.eclipse.jubula.client.core.tests/src/org/eclipse/jubula/client/core/tests/parameter/TestParameterInput.java b/org.eclipse.jubula.client.core.tests/src/org/eclipse/jubula/client/core/tests/parameter/TestParameterInput.java index ff38a5926..15a57f561 100644 --- a/org.eclipse.jubula.client.core.tests/src/org/eclipse/jubula/client/core/tests/parameter/TestParameterInput.java +++ b/org.eclipse.jubula.client.core.tests/src/org/eclipse/jubula/client/core/tests/parameter/TestParameterInput.java @@ -53,13 +53,13 @@ public class TestParameterInput { ParsedParameter param = new ParsedParameter(true, null, null); ast.apply(param); - assertTrue(m_inputString + " succeeded unexpectedly.", m_inputIsValid); + assertTrue(m_inputString + " succeeded unexpectedly.", m_inputIsValid); //$NON-NLS-1$ } catch (ParserException e) { - assertFalse(m_inputString + " failed unexpectedly.", m_inputIsValid); + assertFalse(m_inputString + " failed unexpectedly.", m_inputIsValid); //$NON-NLS-1$ } catch (LexerException e) { - assertFalse(m_inputString + " failed unexpectedly.", m_inputIsValid); + assertFalse(m_inputString + " failed unexpectedly.", m_inputIsValid); //$NON-NLS-1$ } catch (SemanticParsingException spe) { - assertFalse(m_inputString + " failed unexpectedly.", m_inputIsValid); + assertFalse(m_inputString + " failed unexpectedly.", m_inputIsValid); //$NON-NLS-1$ } } @@ -74,33 +74,33 @@ public class TestParameterInput { @Parameters public static Collection<Object[]> createInputStrings() { return Arrays.asList(new Object[][] { - {"", true}, - {"abc123", true}, - {"=PARAMETER", true}, - {"={PARAMETER}", true}, - {"=1", true}, - {"={1}", true}, - {"?abc()", true}, - {"?abc(arg)", true}, - {"?abc(arg1, arg2)", true}, - {"?abc(?abc(arg1, arg2), ={PARAM_ARG}, \\=prefix${VARIABLE_ARG}\\$\\?suffix)", true}, + {"", true}, //$NON-NLS-1$ + {"abc123", true}, //$NON-NLS-1$ + {"=PARAMETER", true}, //$NON-NLS-1$ + {"={PARAMETER}", true}, //$NON-NLS-1$ + {"=1", true}, //$NON-NLS-1$ + {"={1}", true}, //$NON-NLS-1$ + {"?abc()", true}, //$NON-NLS-1$ + {"?abc(arg)", true}, //$NON-NLS-1$ + {"?abc(arg1, arg2)", true}, //$NON-NLS-1$ + {"?abc(?abc(arg1, arg2), ={PARAM_ARG}, \\=prefix${VARIABLE_ARG}\\$\\?suffix)", true}, //$NON-NLS-1$ - {"=", false}, // missing parameter name - {"={}", false}, // missing parameter name - {"$", false}, // missing variable name - {"${}", false}, // missing variable name - {"'", false}, // missing closing single quote - {"?", false}, // missing function body - {"?(", false}, // missing closing parentheses - {"?)", false}, // missing opening parentheses - {"?()", false}, // missing function name - {"?a", false}, // missing function argument list - {"?=", false}, // invalid (parameter symbol) after function symbol - {"??", false}, // invalid (function symbol) after function symbol - {"?$", false}, // invalid (variable symbol) after function symbol - {"?''", false}, // invalid (single quote) after function symbol - {"?abc(?abc(arg1, arg2))", true}, - {"?abc(?abc(arg1, arg2), ={PARAM_ARG}, prefix${VARIABLE_ARG}suffix)", true}, + {"=", false}, // missing parameter name //$NON-NLS-1$ + {"={}", false}, // missing parameter name //$NON-NLS-1$ + {"$", false}, // missing variable name //$NON-NLS-1$ + {"${}", false}, // missing variable name //$NON-NLS-1$ + {"'", false}, // missing closing single quote //$NON-NLS-1$ + {"?", false}, // missing function body //$NON-NLS-1$ + {"?(", false}, // missing closing parentheses //$NON-NLS-1$ + {"?)", false}, // missing opening parentheses //$NON-NLS-1$ + {"?()", false}, // missing function name //$NON-NLS-1$ + {"?a", false}, // missing function argument list //$NON-NLS-1$ + {"?=", false}, // invalid (parameter symbol) after function symbol //$NON-NLS-1$ + {"??", false}, // invalid (function symbol) after function symbol //$NON-NLS-1$ + {"?$", false}, // invalid (variable symbol) after function symbol //$NON-NLS-1$ + {"?''", false}, // invalid (single quote) after function symbol //$NON-NLS-1$ + {"?abc(?abc(arg1, arg2))", true}, //$NON-NLS-1$ + {"?abc(?abc(arg1, arg2), ={PARAM_ARG}, prefix${VARIABLE_ARG}suffix)", true}, //$NON-NLS-1$ }); } } diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ProjectPM.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ProjectPM.java index 5fc20549c..4b04ac3c1 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ProjectPM.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ProjectPM.java @@ -807,28 +807,28 @@ public class ProjectPM extends PersistenceManager findReusedProjects(projectIds, key.getProjectProperties().getUsedProjects()); - preloadDataForClass(s, projectIds, "CompNamesPairPO"); - preloadDataForClass(s, projectIds, "CompIdentifierPO"); - preloadDataForClass(s, projectIds, "AUTConfigPO"); - preloadDataForClass(s, projectIds, "AUTMainPO"); - preloadDataForClass(s, projectIds, "ReusedProjectPO"); - preloadDataForClass(s, projectIds, "UsedToolkitPO"); - preloadDataForClass(s, projectIds, "AUTContPO"); - preloadDataForClass(s, projectIds, "ParamDescriptionPO"); - - preloadDataForClass(s, projectIds, "TDManagerPO"); + preloadDataForClass(s, projectIds, "CompNamesPairPO"); //$NON-NLS-1$ + preloadDataForClass(s, projectIds, "CompIdentifierPO"); //$NON-NLS-1$ + preloadDataForClass(s, projectIds, "AUTConfigPO"); //$NON-NLS-1$ + preloadDataForClass(s, projectIds, "AUTMainPO"); //$NON-NLS-1$ + preloadDataForClass(s, projectIds, "ReusedProjectPO"); //$NON-NLS-1$ + preloadDataForClass(s, projectIds, "UsedToolkitPO"); //$NON-NLS-1$ + preloadDataForClass(s, projectIds, "AUTContPO"); //$NON-NLS-1$ + preloadDataForClass(s, projectIds, "ParamDescriptionPO"); //$NON-NLS-1$ + + preloadDataForClass(s, projectIds, "TDManagerPO"); //$NON-NLS-1$ // Special pre-load due to http://eclip.se/432394 - preloadDistinctDataForClass(s, projectIds, "TestDataCubePO"); + preloadDistinctDataForClass(s, projectIds, "TestDataCubePO"); //$NON-NLS-1$ - preloadDataForClass(s, projectIds, "CapPO"); + preloadDataForClass(s, projectIds, "CapPO"); //$NON-NLS-1$ List<ISpecTestCasePO> testCases = - preloadDataForClass(s, projectIds, "SpecTestCasePO"); + preloadDataForClass(s, projectIds, "SpecTestCasePO"); //$NON-NLS-1$ preloadDataForClass( - s, projectIds, "EventExecTestCasePO"); - preloadDataForClass(s, projectIds, "TestSuitePO"); + s, projectIds, "EventExecTestCasePO"); //$NON-NLS-1$ + preloadDataForClass(s, projectIds, "TestSuitePO"); //$NON-NLS-1$ List<IExecTestCasePO> testCaseRefs = - preloadDataForClass(s, projectIds, "ExecTestCasePO"); - preloadDataForClass(s, projectIds, "CategoryPO"); + preloadDataForClass(s, projectIds, "ExecTestCasePO"); //$NON-NLS-1$ + preloadDataForClass(s, projectIds, "CategoryPO"); //$NON-NLS-1$ // for performance reasons, we prefill the cachedSpecTestCase // in ExecTestCasePOs diff --git a/org.eclipse.jubula.client.qa.caa.gen.ui/src/org/eclipse/jubula/client/qa/caa/gen/ui/handler/GenerateAllHandler.java b/org.eclipse.jubula.client.qa.caa.gen.ui/src/org/eclipse/jubula/client/qa/caa/gen/ui/handler/GenerateAllHandler.java index 945ffe2f4..c413aceb3 100644 --- a/org.eclipse.jubula.client.qa.caa.gen.ui/src/org/eclipse/jubula/client/qa/caa/gen/ui/handler/GenerateAllHandler.java +++ b/org.eclipse.jubula.client.qa.caa.gen.ui/src/org/eclipse/jubula/client/qa/caa/gen/ui/handler/GenerateAllHandler.java @@ -44,7 +44,7 @@ import org.eclipse.jubula.tools.internal.xml.businessmodell.ConcreteComponent; */ public class GenerateAllHandler extends AbstractHandler { /** prefix */ - private static final String REQ_PREFIX = "[] [] [] [] - "; + private static final String REQ_PREFIX = "[] [] [] [] - "; //$NON-NLS-1$ /** eh */ private ISpecTestCasePO m_aeEH; /** eh */ @@ -57,13 +57,13 @@ public class GenerateAllHandler extends AbstractHandler { /** {@inheritDoc} */ protected Object executeImpl(ExecutionEvent event) throws ExecutionException { - final String toolkitID = "ui.toolkit.mobile.IOSToolkitPlugin"; + final String toolkitID = "ui.toolkit.mobile.IOSToolkitPlugin"; //$NON-NLS-1$ List<ConcreteComponent> toolkitComponents = getToolkitComponentList(toolkitID); StringHelper sh = StringHelper.getInstance(); - ICategoryPO category = NodeMaker.createCategoryPO("GENERATED"); + ICategoryPO category = NodeMaker.createCategoryPO("GENERATED"); //$NON-NLS-1$ try { NodePM.addAndPersistChildNode(ISpecObjContPO.TCB_ROOT_NODE, category, null); @@ -80,8 +80,8 @@ public class GenerateAllHandler extends AbstractHandler { final String componentClass = c.getComponentClass().getName(); if (StringUtils.isNotBlank(componentClass)) { - testcaseName += " - " - + StringUtils.substringAfterLast(componentClass, "."); + testcaseName += " - " //$NON-NLS-1$ + + StringUtils.substringAfterLast(componentClass, "."); //$NON-NLS-1$ } ICategoryPO typeCat = NodeMaker.createCategoryPO(testcaseName); @@ -99,9 +99,9 @@ public class GenerateAllHandler extends AbstractHandler { createActionTestCases(typeCat, typeTC, c); } - CommandHelper.executeCommand("org.eclipse.ui.file.refresh"); + CommandHelper.executeCommand("org.eclipse.ui.file.refresh"); //$NON-NLS-1$ } catch (Throwable e) { - throw new ExecutionException("error", e); + throw new ExecutionException("error", e); //$NON-NLS-1$ } return null; @@ -122,13 +122,13 @@ public class GenerateAllHandler extends AbstractHandler { private void createEventHandler(ICategoryPO category) throws PMSaveException, PMAlreadyLockedException, PMException, ProjectDeletedException { - m_aeEH = TestCaseBP.createNewSpecTestCase("EH - Action Error", + m_aeEH = TestCaseBP.createNewSpecTestCase("EH - Action Error", //$NON-NLS-1$ category, null); - m_cfEH = TestCaseBP.createNewSpecTestCase("EH - Check Failed", + m_cfEH = TestCaseBP.createNewSpecTestCase("EH - Check Failed", //$NON-NLS-1$ category, null); - m_cnfEH = TestCaseBP.createNewSpecTestCase("EH - Component not found", + m_cnfEH = TestCaseBP.createNewSpecTestCase("EH - Component not found", //$NON-NLS-1$ category, null); - m_ceEH = TestCaseBP.createNewSpecTestCase("EH - Configuration Error", + m_ceEH = TestCaseBP.createNewSpecTestCase("EH - Configuration Error", //$NON-NLS-1$ category, null); } @@ -154,7 +154,7 @@ public class GenerateAllHandler extends AbstractHandler { PMAlreadyLockedException, PMException, ProjectDeletedException, InvalidDataException { - ICategoryPO actionsCat = NodeMaker.createCategoryPO("Actions"); + ICategoryPO actionsCat = NodeMaker.createCategoryPO("Actions"); //$NON-NLS-1$ NodePM.addAndPersistChildNode(typeCat, actionsCat, null); final StringHelper sh = StringHelper.getInstance(); @@ -185,7 +185,7 @@ public class GenerateAllHandler extends AbstractHandler { NodeMaker.createExecTestCasePO(actionTC), null); ISpecTestCasePO actionTC01 = TestCaseBP.createNewSpecTestCase( - REQ_PREFIX + actionName + " - 01", actionCat, null); + REQ_PREFIX + actionName + " - 01", actionCat, null); //$NON-NLS-1$ TestCaseBP.addReferencedTestCase(actionTC, NodeMaker.createExecTestCasePO(actionTC01), null); @@ -201,25 +201,25 @@ public class GenerateAllHandler extends AbstractHandler { private void addEH(ISpecTestCasePO actionTC) throws InvalidDataException { final IEventExecTestCasePO ae = NodeMaker.createEventExecTestCasePO( m_aeEH, actionTC); - ae.setEventType("TestErrorEvent.Action"); + ae.setEventType("TestErrorEvent.Action"); //$NON-NLS-1$ ae.setReentryProp(ReentryProperty.RETURN); actionTC.addEventTestCase(ae); final IEventExecTestCasePO cf = NodeMaker.createEventExecTestCasePO( m_cfEH, actionTC); - cf.setEventType("TestErrorEvent.VerifyFailed"); + cf.setEventType("TestErrorEvent.VerifyFailed"); //$NON-NLS-1$ cf.setReentryProp(ReentryProperty.CONTINUE); actionTC.addEventTestCase(cf); final IEventExecTestCasePO cnf = NodeMaker.createEventExecTestCasePO( m_cnfEH, actionTC); - cnf.setEventType("TestErrorEvent.CompNotFound"); + cnf.setEventType("TestErrorEvent.CompNotFound"); //$NON-NLS-1$ cnf.setReentryProp(ReentryProperty.RETURN); actionTC.addEventTestCase(cnf); final IEventExecTestCasePO ce = NodeMaker.createEventExecTestCasePO( m_ceEH, actionTC); - ce.setEventType("TestErrorEvent.Config"); + ce.setEventType("TestErrorEvent.Config"); //$NON-NLS-1$ ce.setReentryProp(ReentryProperty.RETURN); actionTC.addEventTestCase(ce); } diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/search/query/ShowWhereUsedComponentNameQuery.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/search/query/ShowWhereUsedComponentNameQuery.java index 260de3ef5..94ada2c74 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/search/query/ShowWhereUsedComponentNameQuery.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/search/query/ShowWhereUsedComponentNameQuery.java @@ -65,9 +65,9 @@ public class ShowWhereUsedComponentNameQuery sb.append(StringConstants.COLON); sb.append(StringConstants.SPACE); sb.append(Messages.UIJobSearchingCompNames); - sb.append(" \""); + sb.append(" \""); //$NON-NLS-1$ sb.append(getCompName().getName()); - sb.append("\""); + sb.append("\""); //$NON-NLS-1$ return sb.toString(); } diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/search/query/ShowWhereUsedSpecTcQuery.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/search/query/ShowWhereUsedSpecTcQuery.java index 3f233acb2..36c36af7c 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/search/query/ShowWhereUsedSpecTcQuery.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/search/query/ShowWhereUsedSpecTcQuery.java @@ -105,9 +105,9 @@ public class ShowWhereUsedSpecTcQuery sb.append(StringConstants.COLON); sb.append(StringConstants.SPACE); sb.append(Messages.UIJobSearchingTestCases); - sb.append(" \""); + sb.append(" \""); //$NON-NLS-1$ sb.append(m_specTC.getName()); - sb.append("\""); + sb.append("\""); //$NON-NLS-1$ return sb.toString(); } diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/search/query/ShowWhereUsedTestDataCubeQuery.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/search/query/ShowWhereUsedTestDataCubeQuery.java index 83dc92752..aadeff172 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/search/query/ShowWhereUsedTestDataCubeQuery.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/search/query/ShowWhereUsedTestDataCubeQuery.java @@ -50,9 +50,9 @@ public class ShowWhereUsedTestDataCubeQuery extends AbstractShowWhereUsedQuery { sb.append(StringConstants.COLON); sb.append(StringConstants.SPACE); sb.append(Messages.UIJobSearchingTestDataCube); - sb.append(" \""); + sb.append(" \""); //$NON-NLS-1$ sb.append(m_testDataCube.getName()); - sb.append("\""); + sb.append("\""); //$NON-NLS-1$ return sb.toString(); } diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/search/query/ShowWhereUsedTestSuiteQuery.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/search/query/ShowWhereUsedTestSuiteQuery.java index b8b9e24a6..417be07c0 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/search/query/ShowWhereUsedTestSuiteQuery.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/search/query/ShowWhereUsedTestSuiteQuery.java @@ -87,9 +87,9 @@ public class ShowWhereUsedTestSuiteQuery sb.append(StringConstants.COLON); sb.append(StringConstants.SPACE); sb.append(Messages.UIJobSearchingTestSuites); - sb.append(" \""); + sb.append(" \""); //$NON-NLS-1$ sb.append(m_testSuite.getName()); - sb.append("\""); + sb.append("\""); //$NON-NLS-1$ return sb.toString(); } diff --git a/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/businessprocess/AutFrameBP.java b/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/businessprocess/AutFrameBP.java index da0f9b3df..78479b00f 100644 --- a/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/businessprocess/AutFrameBP.java +++ b/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/businessprocess/AutFrameBP.java @@ -87,12 +87,12 @@ public class AutFrameBP { int value2 = Integer.parseInt(m_calcPanel.getAddend2()); if (value1 == 17 && value2 == 4) { - m_calcPanel.setResult("jackpot"); + m_calcPanel.setResult("jackpot"); //$NON-NLS-1$ } else { m_calcPanel.setResult(String.valueOf(value1 + value2)); } } catch (NumberFormatException nfe) { - m_calcPanel.setResult("#error"); + m_calcPanel.setResult("#error"); //$NON-NLS-1$ } } diff --git a/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/gui/AboutDialog.java b/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/gui/AboutDialog.java index f5c19e59a..423a37430 100644 --- a/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/gui/AboutDialog.java +++ b/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/gui/AboutDialog.java @@ -55,8 +55,8 @@ public class AboutDialog { m_dialogStage = new Stage(); m_dialogStage.initModality(Modality.APPLICATION_MODAL); - m_aboutText = new Label("Application under Test\n" + "\ncopyright by " - + "BREDEX Software GmbH"); + m_aboutText = new Label("Application under Test\n" + "\ncopyright by " //$NON-NLS-1$ //$NON-NLS-2$ + + "BREDEX Software GmbH"); //$NON-NLS-1$ m_borderPane = new BorderPane(); initialize(); @@ -69,7 +69,7 @@ public class AboutDialog { m_borderPane.setPadding(new Insets(10)); m_aboutScene = new Scene(m_borderPane); - Button okBtn = new Button("OK"); + Button okBtn = new Button("OK"); //$NON-NLS-1$ okBtn.setOnAction(new EventHandler<ActionEvent>() { @Override public void handle(ActionEvent event) { @@ -77,7 +77,7 @@ public class AboutDialog { } }); - m_dialogStage.setTitle("about"); + m_dialogStage.setTitle("about"); //$NON-NLS-1$ m_borderPane.setCenter(m_aboutText); m_borderPane.setBottom(okBtn); diff --git a/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/gui/AutFrame.java b/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/gui/AutFrame.java index 7d86e320e..37553099d 100644 --- a/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/gui/AutFrame.java +++ b/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/gui/AutFrame.java @@ -63,7 +63,7 @@ public class AutFrame { * Manages the Layout of the AUT Frame */ private void initialize() { - m_stage.setTitle("Adder"); + m_stage.setTitle("Adder"); //$NON-NLS-1$ m_scene = new Scene(m_borderPane, 300, 250); m_borderPane.setCenter(m_calcPanel); diff --git a/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/gui/CalcMenuBar.java b/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/gui/CalcMenuBar.java index 4cf742c15..adbd095d6 100644 --- a/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/gui/CalcMenuBar.java +++ b/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/gui/CalcMenuBar.java @@ -52,12 +52,12 @@ public class CalcMenuBar extends MenuBar { * Constructor that Initializes the MenuBar */ public CalcMenuBar() { - this.setId("menuBar"); - m_file = new Menu("File"); - m_reset = new MenuItem("reset"); - m_quit = new MenuItem("quit"); - m_help = new Menu("Help"); - m_about = new MenuItem("about"); + this.setId("menuBar"); //$NON-NLS-1$ + m_file = new Menu("File"); //$NON-NLS-1$ + m_reset = new MenuItem("reset"); //$NON-NLS-1$ + m_quit = new MenuItem("quit"); //$NON-NLS-1$ + m_help = new Menu("Help"); //$NON-NLS-1$ + m_about = new MenuItem("about"); //$NON-NLS-1$ initialize(); } @@ -65,7 +65,7 @@ public class CalcMenuBar extends MenuBar { * Manages the Layout of the MenuBar */ private void initialize() { - m_reset.setAccelerator(KeyCombination.keyCombination("Ctrl+R")); + m_reset.setAccelerator(KeyCombination.keyCombination("Ctrl+R")); //$NON-NLS-1$ this.getMenus().addAll(m_file, m_help); m_file.getItems().addAll(m_reset, m_quit); diff --git a/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/gui/CalculatorPanel.java b/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/gui/CalculatorPanel.java index 6fd7ba1a5..eacf5c7c1 100644 --- a/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/gui/CalculatorPanel.java +++ b/org.eclipse.jubula.examples.aut.adder.javafx/src/org/eclipse/jubula/examples/aut/adder/javafx/gui/CalculatorPanel.java @@ -65,29 +65,29 @@ public class CalculatorPanel extends GridPane { * Constructor that Initializes the CalculatorPanel */ public CalculatorPanel() { - m_value1 = new Label("value1"); - m_value1.setId("Label value1"); + m_value1 = new Label("value1"); //$NON-NLS-1$ + m_value1.setId("Label value1"); //$NON-NLS-1$ - m_value2 = new Label("value2"); - m_value2.setId("Label value2"); + m_value2 = new Label("value2"); //$NON-NLS-1$ + m_value2.setId("Label value2"); //$NON-NLS-1$ - m_opSymbol = new Label("+"); - m_opSymbol.setId("opSymbol"); + m_opSymbol = new Label("+"); //$NON-NLS-1$ + m_opSymbol.setId("opSymbol"); //$NON-NLS-1$ - m_result = new Label("result"); - m_result.setId("Label result"); + m_result = new Label("result"); //$NON-NLS-1$ + m_result.setId("Label result"); //$NON-NLS-1$ m_fieldValue1 = new TextField(); - m_fieldValue1.setId("value1"); + m_fieldValue1.setId("value1"); //$NON-NLS-1$ m_fieldValue2 = new TextField(); - m_fieldValue2.setId("value2"); + m_fieldValue2.setId("value2"); //$NON-NLS-1$ m_fieldResult = new TextField(); - m_fieldResult.setId("result"); + m_fieldResult.setId("result"); //$NON-NLS-1$ - m_buttonResult = new Button("="); - m_buttonResult.setId("equal"); + m_buttonResult = new Button("="); //$NON-NLS-1$ + m_buttonResult.setId("equal"); //$NON-NLS-1$ initialize(); } @@ -165,8 +165,8 @@ public class CalculatorPanel extends GridPane { * Deletes the Text in all TextFields */ public void reset() { - m_fieldResult.setText(""); - m_fieldValue1.setText(""); - m_fieldValue2.setText(""); + m_fieldResult.setText(""); //$NON-NLS-1$ + m_fieldValue1.setText(""); //$NON-NLS-1$ + m_fieldValue2.setText(""); //$NON-NLS-1$ } } diff --git a/org.eclipse.jubula.examples.extension.javafx.aut/src/org/eclipse/jubula/examples/extension/javafx/aut/PieChartExampleAUT.java b/org.eclipse.jubula.examples.extension.javafx.aut/src/org/eclipse/jubula/examples/extension/javafx/aut/PieChartExampleAUT.java index ddc248bd5..5504b7535 100644 --- a/org.eclipse.jubula.examples.extension.javafx.aut/src/org/eclipse/jubula/examples/extension/javafx/aut/PieChartExampleAUT.java +++ b/org.eclipse.jubula.examples.extension.javafx.aut/src/org/eclipse/jubula/examples/extension/javafx/aut/PieChartExampleAUT.java @@ -36,7 +36,7 @@ public class PieChartExampleAUT extends Application { public void start(Stage stage) { Pane root = new VBox(); Scene scene = new Scene(root); - stage.setTitle("Pie Chart Example"); + stage.setTitle("Pie Chart Example"); //$NON-NLS-1$ stage.setWidth(500); stage.setHeight(500); @@ -45,21 +45,21 @@ public class PieChartExampleAUT extends Application { } final PieChart chart = new PieChart(pieChartData); - chart.setTitle("Random Data"); - chart.setId("pieChart"); + chart.setTitle("Random Data"); //$NON-NLS-1$ + chart.setId("pieChart"); //$NON-NLS-1$ Pane buttonArea = new HBox(); root.getChildren().addAll(chart, buttonArea); - Button plus = new Button("+"); - plus.setId("plusButton"); + Button plus = new Button("+"); //$NON-NLS-1$ + plus.setId("plusButton"); //$NON-NLS-1$ plus.setPrefWidth(50); plus.setOnMouseClicked(e -> { addData(); }); - Button minus = new Button("-"); - minus.setId("minusButton"); + Button minus = new Button("-"); //$NON-NLS-1$ + minus.setId("minusButton"); //$NON-NLS-1$ minus.setPrefWidth(50); minus.setOnMouseClicked(e -> { removeData(); @@ -73,7 +73,7 @@ public class PieChartExampleAUT extends Application { /** adds a data set */ private void addData() { - pieChartData.add(new PieChart.Data("Data" + dataAmount, Math.random())); + pieChartData.add(new PieChart.Data("Data" + dataAmount, Math.random())); //$NON-NLS-1$ dataAmount++; } diff --git a/org.eclipse.jubula.launch.rcp.ui/src/org/eclipse/jubula/launch/rcp/ui/RcpAutLaunchConfigurationTab.java b/org.eclipse.jubula.launch.rcp.ui/src/org/eclipse/jubula/launch/rcp/ui/RcpAutLaunchConfigurationTab.java index f3b1a5102..a9f26cea6 100644 --- a/org.eclipse.jubula.launch.rcp.ui/src/org/eclipse/jubula/launch/rcp/ui/RcpAutLaunchConfigurationTab.java +++ b/org.eclipse.jubula.launch.rcp.ui/src/org/eclipse/jubula/launch/rcp/ui/RcpAutLaunchConfigurationTab.java @@ -99,7 +99,7 @@ public class RcpAutLaunchConfigurationTab extends AutLaunchConfigurationTab { org.eclipse.jubula.client.ui.rcp.i18n.Messages. AUTPropertiesDialogGenerateNames); ControlDecorator.createInfo(label, - I18n.getString("AUTPropertiesDialog.generateNamesDescription"), + I18n.getString("AUTPropertiesDialog.generateNamesDescription"), //$NON-NLS-1$ false); m_generateNamesFlag = new Button(additionalComposite, SWT.CHECK); diff --git a/org.eclipse.jubula.project.configuration/settings/1.5/org.eclipse.jdt.core.prefs b/org.eclipse.jubula.project.configuration/settings/1.5/org.eclipse.jdt.core.prefs index 229ff5668..043698484 100644 --- a/org.eclipse.jubula.project.configuration/settings/1.5/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jubula.project.configuration/settings/1.5/org.eclipse.jdt.core.prefs @@ -47,7 +47,7 @@ org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=warning diff --git a/org.eclipse.jubula.project.configuration/settings/1.6/org.eclipse.jdt.core.prefs b/org.eclipse.jubula.project.configuration/settings/1.6/org.eclipse.jdt.core.prefs index f7f36edb2..c5b7f4278 100644 --- a/org.eclipse.jubula.project.configuration/settings/1.6/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jubula.project.configuration/settings/1.6/org.eclipse.jdt.core.prefs @@ -37,7 +37,7 @@ org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error org.eclipse.jdt.core.compiler.problem.nullReference=warning org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore diff --git a/org.eclipse.jubula.project.configuration/settings/1.7/org.eclipse.jdt.core.prefs b/org.eclipse.jubula.project.configuration/settings/1.7/org.eclipse.jdt.core.prefs index d7b295d51..277340c52 100644 --- a/org.eclipse.jubula.project.configuration/settings/1.7/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jubula.project.configuration/settings/1.7/org.eclipse.jdt.core.prefs @@ -48,7 +48,7 @@ org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=warning diff --git a/org.eclipse.jubula.project.configuration/settings/1.8/org.eclipse.jdt.core.prefs b/org.eclipse.jubula.project.configuration/settings/1.8/org.eclipse.jdt.core.prefs index 3f4d55595..75df895b9 100644 --- a/org.eclipse.jubula.project.configuration/settings/1.8/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jubula.project.configuration/settings/1.8/org.eclipse.jdt.core.prefs @@ -48,7 +48,7 @@ org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=warning diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/CapTestCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/CapTestCommand.java index 72cff0254..90ce0fa4c 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/CapTestCommand.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/CapTestCommand.java @@ -56,7 +56,7 @@ public class CapTestCommand implements ICommand { private static final Logger LOG = LoggerFactory.getLogger( CapTestCommand.class); /** The logger */ - private static final Logger CAPLOG = LoggerFactory.getLogger("CAP"); + private static final Logger CAPLOG = LoggerFactory.getLogger("CAP"); //$NON-NLS-1$ /** The message. */ @@ -229,13 +229,13 @@ public class CapTestCommand implements ICommand { MethodInvoker invoker = new MethodInvoker(messageCap); Object returnValue = invoker.invoke(implClass); response.setReturnValue((String)returnValue); - if ("true".equals(System.getenv("LogExecutedCaps")) + if ("true".equals(System.getenv("LogExecutedCaps")) //$NON-NLS-1$ //$NON-NLS-2$ && messageCap != null && messageCap.getCi() != null && messageCap.getCi().getComponentClassName() != null && messageCap.getAction() != null && messageCap.getAction().getName() != null) { - CAPLOG.debug(messageCap.getCi().getComponentClassName() + " - " + CAPLOG.debug(messageCap.getCi().getComponentClassName() + " - " //$NON-NLS-1$ + CompSystemI18n.getString( messageCap.getAction().getName())); } diff --git a/org.eclipse.jubula.rc.javafx.j8u40/src/org/eclipse/jubula/rc/javafx/j8u40/tester/adapter/ButtonBarContainerAdapter.java b/org.eclipse.jubula.rc.javafx.j8u40/src/org/eclipse/jubula/rc/javafx/j8u40/tester/adapter/ButtonBarContainerAdapter.java index 6ae67d4a6..0f6efb5f0 100644 --- a/org.eclipse.jubula.rc.javafx.j8u40/src/org/eclipse/jubula/rc/javafx/j8u40/tester/adapter/ButtonBarContainerAdapter.java +++ b/org.eclipse.jubula.rc.javafx.j8u40/src/org/eclipse/jubula/rc/javafx/j8u40/tester/adapter/ButtonBarContainerAdapter.java @@ -41,7 +41,7 @@ public class ButtonBarContainerAdapter<T extends ButtonBar> extends /** {@inheritDoc} */ public List<Node> getContent() { - return EventThreadQueuerJavaFXImpl.invokeAndWait("getContent", + return EventThreadQueuerJavaFXImpl.invokeAndWait("getContent", //$NON-NLS-1$ new Callable<List<Node>>() { @Override @@ -53,7 +53,7 @@ public class ButtonBarContainerAdapter<T extends ButtonBar> extends /** {@inheritDoc} */ public ReadOnlyObjectProperty<? extends Window> getWindow() { - return EventThreadQueuerJavaFXImpl.invokeAndWait("getWindow", + return EventThreadQueuerJavaFXImpl.invokeAndWait("getWindow", //$NON-NLS-1$ new Callable<ReadOnlyObjectProperty<? extends Window>>() { @Override diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/adapter/BackgroundPropertyValueAdapter.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/adapter/BackgroundPropertyValueAdapter.java index a79c8e570..4fc890cc1 100644 --- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/adapter/BackgroundPropertyValueAdapter.java +++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/adapter/BackgroundPropertyValueAdapter.java @@ -27,13 +27,13 @@ public class BackgroundPropertyValueAdapter /** {@inheritDoc} */ public String getStringRepresentation(Background b) { - StringBuilder sb = new StringBuilder("Fills="); + StringBuilder sb = new StringBuilder("Fills="); //$NON-NLS-1$ Iterator<BackgroundFill> fillIterator = b.getFills().iterator(); while (fillIterator.hasNext()) { BackgroundFill backgroundFill = fillIterator.next(); sb.append(backgroundFill.getFill().toString()); if (fillIterator.hasNext()) { - sb.append(","); + sb.append(","); //$NON-NLS-1$ } } return sb.toString(); diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/adapter/BorderPropertyValueAdapter.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/adapter/BorderPropertyValueAdapter.java index d982c6406..72d4db065 100644 --- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/adapter/BorderPropertyValueAdapter.java +++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/adapter/BorderPropertyValueAdapter.java @@ -30,31 +30,31 @@ public class BorderPropertyValueAdapter Iterator<BorderStroke> strokeIterator = b.getStrokes().iterator(); while (strokeIterator.hasNext()) { BorderStroke stroke = strokeIterator.next(); - sb.append("LeftStroke: " - + "Color=" + stroke.getLeftStroke().toString() - + "," - + "Style=" + stroke.getLeftStyle().toString() + sb.append("LeftStroke: " //$NON-NLS-1$ + + "Color=" + stroke.getLeftStroke().toString() //$NON-NLS-1$ + + "," //$NON-NLS-1$ + + "Style=" + stroke.getLeftStyle().toString() //$NON-NLS-1$ ); - sb.append("; "); - sb.append("RightStroke: " - + "Color=" + stroke.getRightStroke().toString() - + "," - + "Style=" + stroke.getRightStyle().toString() + sb.append("; "); //$NON-NLS-1$ + sb.append("RightStroke: " //$NON-NLS-1$ + + "Color=" + stroke.getRightStroke().toString() //$NON-NLS-1$ + + "," //$NON-NLS-1$ + + "Style=" + stroke.getRightStyle().toString() //$NON-NLS-1$ ); - sb.append("; "); - sb.append("TopStroke: " - + "Color=" + stroke.getTopStroke().toString() - + "," - + "Style=" + stroke.getTopStyle().toString() + sb.append("; "); //$NON-NLS-1$ + sb.append("TopStroke: " //$NON-NLS-1$ + + "Color=" + stroke.getTopStroke().toString() //$NON-NLS-1$ + + "," //$NON-NLS-1$ + + "Style=" + stroke.getTopStyle().toString() //$NON-NLS-1$ ); - sb.append("; "); - sb.append("BottomStroke: " - + "Color=" + stroke.getBottomStroke().toString() - + "," - + "Style=" + stroke.getBottomStyle().toString() + sb.append("; "); //$NON-NLS-1$ + sb.append("BottomStroke: " //$NON-NLS-1$ + + "Color=" + stroke.getBottomStroke().toString() //$NON-NLS-1$ + + "," //$NON-NLS-1$ + + "Style=" + stroke.getBottomStyle().toString() //$NON-NLS-1$ ); if (strokeIterator.hasNext()) { - sb.append(" | "); + sb.append(" | "); //$NON-NLS-1$ } } return sb.toString(); diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/components/VisibleChangeHandler.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/components/VisibleChangeHandler.java index a1fddcda9..92eee1ad1 100644 --- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/components/VisibleChangeHandler.java +++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/components/VisibleChangeHandler.java @@ -38,7 +38,7 @@ public enum VisibleChangeHandler implements ChangeListener<Boolean> { Boolean oldValue, Boolean newValue) { if (!(observable instanceof BooleanProperty)) { // this should not happen - log.error("The observed visible property is not a BooleanProperty"); + log.error("The observed visible property is not a BooleanProperty"); //$NON-NLS-1$ return; } if (!newValue) { diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/driver/KeyJavaFXEventMatcher.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/driver/KeyJavaFXEventMatcher.java index c49a8988a..e43fa636d 100644 --- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/driver/KeyJavaFXEventMatcher.java +++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/driver/KeyJavaFXEventMatcher.java @@ -46,7 +46,7 @@ public class KeyJavaFXEventMatcher extends DefaultJavaFXEventMatcher<KeyEvent> { for (Object object : eventObjects) { Event e = (Event) object; if (e instanceof KeyEvent) { - log.warn("Key event matching fallback used."); + log.warn("Key event matching fallback used."); //$NON-NLS-1$ return true; } } diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/driver/RobotJavaFXImpl.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/driver/RobotJavaFXImpl.java index 6b61d3135..81d62d543 100644 --- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/driver/RobotJavaFXImpl.java +++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/driver/RobotJavaFXImpl.java @@ -504,7 +504,7 @@ public class RobotJavaFXImpl implements IRobot<Rectangle> { boolean isInside = true; if (graphicsComponent instanceof Node) { isInside = EventThreadQueuerJavaFXImpl.invokeAndWait( - "CheckIfContains", new Callable<Boolean>() { + "CheckIfContains", new Callable<Boolean>() { //$NON-NLS-1$ @Override public Boolean call() throws Exception { return NodeBounds.checkIfContains(new Point2D( diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/listener/ComponentHandler.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/listener/ComponentHandler.java index 3df16d8c0..6d4a1cb9d 100644 --- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/listener/ComponentHandler.java +++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/listener/ComponentHandler.java @@ -133,7 +133,7 @@ public class ComponentHandler implements ListChangeListener<Stage>, * @return List */ public static <T> List<? extends T> getAssignableFrom(final Class<T> type) { - return EventThreadQueuerJavaFXImpl.invokeAndWait("getAssignableFrom", + return EventThreadQueuerJavaFXImpl.invokeAndWait("getAssignableFrom", //$NON-NLS-1$ new Callable<List<? extends T>>() { @Override diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/TableTester.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/TableTester.java index 083eb1901..db728fcf8 100644 --- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/TableTester.java +++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/TableTester.java @@ -168,7 +168,7 @@ public class TableTester extends AbstractTableTester { * @return the index path */ private String getColumnPath(TableColumnBase column, TableView table) { - String colPath = ""; + String colPath = ""; //$NON-NLS-1$ TableColumnBase nxtColumn = column; while (nxtColumn.getParentColumn() != null) { colPath = String.valueOf(TestDataConstants. @@ -422,7 +422,7 @@ public class TableTester extends AbstractTableTester { final int implRow = adapter.getRowFromString(row, rowOperator); // if row is header boolean result = EventThreadQueuerJavaFXImpl.invokeAndWait( - "rcVerifyValueInRow", new Callable<Boolean>() { + "rcVerifyValueInRow", new Callable<Boolean>() { //$NON-NLS-1$ @Override public Boolean call() throws Exception { @@ -456,7 +456,7 @@ public class TableTester extends AbstractTableTester { private String getColumnByName(final String name, final String operator, final String searchType, final ITableComponent adapter, final int implRow) { - return EventThreadQueuerJavaFXImpl.invokeAndWait("getColumnByName", + return EventThreadQueuerJavaFXImpl.invokeAndWait("getColumnByName", //$NON-NLS-1$ new Callable<String>() { @Override @@ -550,7 +550,7 @@ public class TableTester extends AbstractTableTester { final String searchType, final ITableComponent adapter, final int implRow) { return EventThreadQueuerJavaFXImpl.invokeAndWait( - "getColumnByValue", new Callable<String>() { + "getColumnByValue", new Callable<String>() { //$NON-NLS-1$ @Override public String call() { @@ -566,7 +566,7 @@ public class TableTester extends AbstractTableTester { int index = adapter.getColumnFromString( getColumnPath(column, (TableView) getRealComponent()), - "equals"); + "equals"); //$NON-NLS-1$ String cellValue = adapter. getCellText(implRow, index); if (MatchUtil.getInstance().match( @@ -594,7 +594,7 @@ public class TableTester extends AbstractTableTester { final int implRow = adapter.getRowFromString(row, rowOperator); // if row is header String result = EventThreadQueuerJavaFXImpl.invokeAndWait( - "rcSelectCellByColValue", new Callable<String>() { + "rcSelectCellByColValue", new Callable<String>() { //$NON-NLS-1$ @Override public String call() throws Exception { diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/JavaFXComponentAdapter.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/JavaFXComponentAdapter.java index de1bda55d..c5d48ccdc 100644 --- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/JavaFXComponentAdapter.java +++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/JavaFXComponentAdapter.java @@ -238,9 +238,8 @@ public class JavaFXComponentAdapter<T extends Node> extends POPUP_NOT_FOUND)); } else if (result.size() > 1) { throw new StepExecutionException("Multiple Context Menus were found", //$NON-NLS-1$ - EventFactory - .createActionError(TestErrorEvent. - UNSUPPORTED_OPERATION_IN_TOOLKIT_ERROR)); //$NON-NLS-1$ + EventFactory.createActionError(TestErrorEvent. + UNSUPPORTED_OPERATION_IN_TOOLKIT_ERROR)); } return menuTester; } @@ -321,7 +320,7 @@ public class JavaFXComponentAdapter<T extends Node> extends Point2D mousePos = new Point2D(currentMousePosition.x, currentMousePosition.y); boolean widgetContainsCurrentPos = - EventThreadQueuerJavaFXImpl.invokeAndWait("showPopup", + EventThreadQueuerJavaFXImpl.invokeAndWait("showPopup", //$NON-NLS-1$ new Callable<Boolean>() { @Override public Boolean call() throws Exception { @@ -331,7 +330,7 @@ public class JavaFXComponentAdapter<T extends Node> extends }); if (widgetContainsCurrentPos) { Point2D local = EventThreadQueuerJavaFXImpl.invokeAndWait( - "showPopup", new Callable<Point2D>() { + "showPopup", new Callable<Point2D>() { //$NON-NLS-1$ @Override public Point2D call() throws Exception { return getRealComponent().screenToLocal(mousePos); diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/LabeledGraphicContainerAdapter.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/LabeledGraphicContainerAdapter.java index db7ced6df..d6096bb78 100644 --- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/LabeledGraphicContainerAdapter.java +++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/LabeledGraphicContainerAdapter.java @@ -44,7 +44,7 @@ public class LabeledGraphicContainerAdapter<T extends Labeled> extends @Override public List<Node> getContent() { - return EventThreadQueuerJavaFXImpl.invokeAndWait("getContent", + return EventThreadQueuerJavaFXImpl.invokeAndWait("getContent", //$NON-NLS-1$ new Callable<List<Node>>() { @Override @@ -58,7 +58,7 @@ public class LabeledGraphicContainerAdapter<T extends Labeled> extends @Override public ReadOnlyObjectProperty<? extends Window> getWindow() { - return EventThreadQueuerJavaFXImpl.invokeAndWait("getWindow", + return EventThreadQueuerJavaFXImpl.invokeAndWait("getWindow", //$NON-NLS-1$ new Callable<ReadOnlyObjectProperty<? extends Window>>() { @Override diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/ScrollPaneAdapter.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/ScrollPaneAdapter.java index f693af97c..1269acee9 100644 --- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/ScrollPaneAdapter.java +++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/ScrollPaneAdapter.java @@ -38,7 +38,7 @@ public class ScrollPaneAdapter extends JavaFXComponentAdapter<ScrollPane> @Override public List<Node> getContent() { - return EventThreadQueuerJavaFXImpl.invokeAndWait("getContent", + return EventThreadQueuerJavaFXImpl.invokeAndWait("getContent", //$NON-NLS-1$ new Callable<List<Node>>() { @Override diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/SplitPaneAdapter.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/SplitPaneAdapter.java index 696702334..67f682cb4 100644 --- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/SplitPaneAdapter.java +++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/SplitPaneAdapter.java @@ -38,7 +38,7 @@ public class SplitPaneAdapter extends JavaFXComponentAdapter<SplitPane> @Override public List<Node> getContent() { - return EventThreadQueuerJavaFXImpl.invokeAndWait("getContent", + return EventThreadQueuerJavaFXImpl.invokeAndWait("getContent", //$NON-NLS-1$ new Callable<List<Node>>() { @Override diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TabPaneAdapter.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TabPaneAdapter.java index 70a73946c..ed38e8031 100644 --- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TabPaneAdapter.java +++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TabPaneAdapter.java @@ -213,7 +213,7 @@ public class TabPaneAdapter extends JavaFXComponentAdapter<TabPane> */ @Override public List<Node> getContent() { - return EventThreadQueuerJavaFXImpl.invokeAndWait("getContent", + return EventThreadQueuerJavaFXImpl.invokeAndWait("getContent", //$NON-NLS-1$ new Callable<List<Node>>() { @Override diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TitledPaneAdapter.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TitledPaneAdapter.java index 3ed2defe3..3c19b62ab 100644 --- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TitledPaneAdapter.java +++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TitledPaneAdapter.java @@ -40,7 +40,7 @@ public class TitledPaneAdapter extends @Override public List<Node> getContent() { List<Node> l = super.getContent(); - l.addAll(EventThreadQueuerJavaFXImpl.invokeAndWait("getContent", + l.addAll(EventThreadQueuerJavaFXImpl.invokeAndWait("getContent", //$NON-NLS-1$ new Callable<List<Node>>() { @Override diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/ToolBarAdapter.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/ToolBarAdapter.java index 32fe074d2..b7b7032fb 100644 --- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/ToolBarAdapter.java +++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/ToolBarAdapter.java @@ -38,7 +38,7 @@ public class ToolBarAdapter extends JavaFXComponentAdapter<ToolBar> implements @Override public List<Node> getContent() { - return EventThreadQueuerJavaFXImpl.invokeAndWait("getContent", + return EventThreadQueuerJavaFXImpl.invokeAndWait("getContent", //$NON-NLS-1$ new Callable<List<Node>>() { @Override diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TreeOperationContext.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TreeOperationContext.java index 0412ac635..5b6ca9d8c 100644 --- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TreeOperationContext.java +++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TreeOperationContext.java @@ -65,7 +65,7 @@ public class TreeOperationContext super(queuer, robot, tree); if (tree.getRoot() == null) { throw new StepExecutionException( - "Tree is empty.", + "Tree is empty.", //$NON-NLS-1$ EventFactory.createActionError(TestErrorEvent.NOT_FOUND)); } } diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TreeTableOperationContext.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TreeTableOperationContext.java index d332be0f1..8ab469b6a 100644 --- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TreeTableOperationContext.java +++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TreeTableOperationContext.java @@ -68,7 +68,7 @@ public class TreeTableOperationContext extends super(queuer, robot, treeTable); if (treeTable.getRoot() == null) { throw new StepExecutionException( - "Tree Table is empty.", + "Tree Table is empty.", //$NON-NLS-1$ EventFactory.createActionError(TestErrorEvent.NOT_FOUND)); } } diff --git a/org.eclipse.jubula.toolkit.ios.provider/src/org/eclipse/jubula/toolkit/ios/provider/ui/IOSAutConfigComponent.java b/org.eclipse.jubula.toolkit.ios.provider/src/org/eclipse/jubula/toolkit/ios/provider/ui/IOSAutConfigComponent.java index d256d2b42..b8174c28e 100644 --- a/org.eclipse.jubula.toolkit.ios.provider/src/org/eclipse/jubula/toolkit/ios/provider/ui/IOSAutConfigComponent.java +++ b/org.eclipse.jubula.toolkit.ios.provider/src/org/eclipse/jubula/toolkit/ios/provider/ui/IOSAutConfigComponent.java @@ -30,7 +30,7 @@ public class IOSAutConfigComponent extends MobileAutConfigComponent { /** the technical name prefix */ private static final String TECHNICAL_NAME_PREFIX = "org.eclipse.jubula.toolkit.mobile.provider.ios.ui.iOSAutConfigComponent."; //$NON-NLS-1$ /** the platform name */ - private static final String PLATFORM = "iOS"; + private static final String PLATFORM = "iOS"; //$NON-NLS-1$ /** * Constructor @@ -61,7 +61,7 @@ public class IOSAutConfigComponent extends MobileAutConfigComponent { // AUT hostname property Label autHostnameLabel = UIComponentHelper.createLabelWithText( - basicAreaComposite, PLATFORM + " " + Messages.autHostnameLabel); + basicAreaComposite, PLATFORM + " " + Messages.autHostnameLabel); //$NON-NLS-1$ autHostnameLabel.setData(SwtToolkitConstants.WIDGET_NAME, TECHNICAL_NAME_PREFIX + "autHostnameLabel"); //$NON-NLS-1$ diff --git a/org.eclipse.jubula.toolkit.mobile.provider/src/org/eclipse/jubula/toolkit/mobile/provider/ui/MobileAutConfigComponent.java b/org.eclipse.jubula.toolkit.mobile.provider/src/org/eclipse/jubula/toolkit/mobile/provider/ui/MobileAutConfigComponent.java index ae1f2ca49..25ef1bcff 100644 --- a/org.eclipse.jubula.toolkit.mobile.provider/src/org/eclipse/jubula/toolkit/mobile/provider/ui/MobileAutConfigComponent.java +++ b/org.eclipse.jubula.toolkit.mobile.provider/src/org/eclipse/jubula/toolkit/mobile/provider/ui/MobileAutConfigComponent.java @@ -147,7 +147,7 @@ public class MobileAutConfigComponent extends AutConfigComponent { DialogStatusParameter error = null; String autHostname = m_autHostTextField.getText(); if (autHostname.length() == 0) { - error = createErrorStatus("The " + Messages.emptyHostname); + error = createErrorStatus("The " + Messages.emptyHostname); //$NON-NLS-1$ } else { putConfigValue(AutConfigConstants.AUT_HOST, autHostname); } @@ -163,7 +163,7 @@ public class MobileAutConfigComponent extends AutConfigComponent { DialogStatusParameter error = null; String autPortname = m_autPortTextField.getText(); if (autPortname.length() == 0) { - error = createErrorStatus("The " + Messages.emptyPort); + error = createErrorStatus("The " + Messages.emptyPort); //$NON-NLS-1$ } else { putConfigValue(AutConfigConstants.AUT_HOST_PORT, autPortname); } |