RED-1156 (github #221) nested executables coloring

- review fixes
nokia · Aug 22, 2018 · 480ba3a · 480ba3a
1 parent 353eb9e
commit 480ba3a
Show file tree

Hide file tree

Showing 20 changed files with 28 additions and 28 deletions.
diff --git a/...c/org/robotframework/ide/eclipse/main/plugin/project/build/fix/JoinTemplateNameFixer.java b/...c/org/robotframework/ide/eclipse/main/plugin/project/build/fix/JoinTemplateNameFixer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Nokia Solutions and Networks
+ * Copyright 2018 Nokia Solutions and Networks
  * Licensed under the Apache License, Version 2.0,
  * see license.txt file for details.
  */
@@ -32,13 +32,13 @@
 
 public class JoinTemplateNameFixer extends RedSuiteMarkerResolution {
 
-    // Removes Test Timeout message:
+    // Joins Test Template keyword written in multiple cells:
     // *** Settings ***
-    // Test Timeout    2 min    my custom    message
+    // Test Template    key    word
     //
     // ->
     // *** Settings ***
-    // Metadata key val
+    // Test Template    key word
 
     @Override
     public String getLabel() {

diff --git a/...ns/src/main/java/org/rf/ide/core/testdata/mapping/keywords/KeywordArgumentsMapperOld.java b/...ns/src/main/java/org/rf/ide/core/testdata/mapping/keywords/KeywordArgumentsMapperOld.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Nokia Solutions and Networks
+ * Copyright 2018 Nokia Solutions and Networks
  * Licensed under the Apache License, Version 2.0,
  * see license.txt file for details.
  */

diff --git a/...rc/main/java/org/rf/ide/core/testdata/mapping/keywords/KeywordDocumentationMapperOld.java b/...rc/main/java/org/rf/ide/core/testdata/mapping/keywords/KeywordDocumentationMapperOld.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Nokia Solutions and Networks
+ * Copyright 2018 Nokia Solutions and Networks
  * Licensed under the Apache License, Version 2.0,
  * see license.txt file for details.
  */

diff --git a/...tions/src/main/java/org/rf/ide/core/testdata/mapping/keywords/KeywordReturnMapperOld.java b/...tions/src/main/java/org/rf/ide/core/testdata/mapping/keywords/KeywordReturnMapperOld.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Nokia Solutions and Networks
+ * Copyright 2018 Nokia Solutions and Networks
  * Licensed under the Apache License, Version 2.0,
  * see license.txt file for details.
  */

diff --git a/...nctions/src/main/java/org/rf/ide/core/testdata/mapping/keywords/KeywordTagsMapperOld.java b/...nctions/src/main/java/org/rf/ide/core/testdata/mapping/keywords/KeywordTagsMapperOld.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Nokia Solutions and Networks
+ * Copyright 2018 Nokia Solutions and Networks
  * Licensed under the Apache License, Version 2.0,
  * see license.txt file for details.
  */

diff --git a/...ons/src/main/java/org/rf/ide/core/testdata/mapping/keywords/KeywordTeardownMapperOld.java b/...ons/src/main/java/org/rf/ide/core/testdata/mapping/keywords/KeywordTeardownMapperOld.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Nokia Solutions and Networks
+ * Copyright 2018 Nokia Solutions and Networks
  * Licensed under the Apache License, Version 2.0,
  * see license.txt file for details.
  */

diff --git a/...ions/src/main/java/org/rf/ide/core/testdata/mapping/keywords/KeywordTimeoutMapperOld.java b/...ions/src/main/java/org/rf/ide/core/testdata/mapping/keywords/KeywordTimeoutMapperOld.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Nokia Solutions and Networks
+ * Copyright 2018 Nokia Solutions and Networks
  * Licensed under the Apache License, Version 2.0,
  * see license.txt file for details.
  */

diff --git a/.../src/main/java/org/rf/ide/core/testdata/mapping/keywords/KeywordTimeoutMessageMapper.java b/.../src/main/java/org/rf/ide/core/testdata/mapping/keywords/KeywordTimeoutMessageMapper.java
@@ -33,13 +33,13 @@ public boolean checkIfCanBeMapped(final RobotFileOutput robotFileOutput, final R
         if (currentState == ParsingState.KEYWORD_SETTING_TIMEOUT) {
             final List<UserKeyword> keywords = robotFileOutput.getFileModel().getKeywordTable().getKeywords();
             final List<KeywordTimeout> keywordTimeouts = keywords.get(keywords.size() - 1).getTimeouts();
-            return checkIfHasAlreadyValue(keywordTimeouts);
+            return hasValueAlready(keywordTimeouts);
         }
         return currentState == ParsingState.KEYWORD_SETTING_TIMEOUT_VALUE
                 || currentState == ParsingState.KEYWORD_SETTING_TIMEOUT_MESSAGE_ARGUMENTS;
     }
 
-    private boolean checkIfHasAlreadyValue(final List<KeywordTimeout> keywordTimeouts) {
+    private boolean hasValueAlready(final List<KeywordTimeout> keywordTimeouts) {
         return !keywordTimeouts.isEmpty() && keywordTimeouts.get(keywordTimeouts.size() - 1).getTimeout() != null;
     }
 

diff --git a/...ns/src/main/java/org/rf/ide/core/testdata/mapping/keywords/KeywordTimeoutValueMapper.java b/...ns/src/main/java/org/rf/ide/core/testdata/mapping/keywords/KeywordTimeoutValueMapper.java
@@ -32,12 +32,12 @@ public boolean checkIfCanBeMapped(final RobotFileOutput robotFileOutput, final R
         if (utility.getCurrentStatus(processingState) == ParsingState.KEYWORD_SETTING_TIMEOUT) {
             final List<UserKeyword> keywords = robotFileOutput.getFileModel().getKeywordTable().getKeywords();
             final List<KeywordTimeout> timeouts = keywords.get(keywords.size() - 1).getTimeouts();
-            return !checkIfHasAlreadyValue(timeouts);
+            return !hasValueAlready(timeouts);
         }
         return false;
     }
 
-    private boolean checkIfHasAlreadyValue(final List<KeywordTimeout> keywordTimeouts) {
+    private boolean hasValueAlready(final List<KeywordTimeout> keywordTimeouts) {
         return !keywordTimeouts.isEmpty() && keywordTimeouts.get(keywordTimeouts.size() - 1).getTimeout() != null;
     }
 

diff --git a/.../main/java/org/rf/ide/core/testdata/mapping/testcases/TestCaseDocumentationMapperOld.java b/.../main/java/org/rf/ide/core/testdata/mapping/testcases/TestCaseDocumentationMapperOld.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Nokia Solutions and Networks
+ * Copyright 2018 Nokia Solutions and Networks
  * Licensed under the Apache License, Version 2.0,
  * see license.txt file for details.
  */

diff --git a/...ions/src/main/java/org/rf/ide/core/testdata/mapping/testcases/TestCaseSetupMapperOld.java b/...ions/src/main/java/org/rf/ide/core/testdata/mapping/testcases/TestCaseSetupMapperOld.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Nokia Solutions and Networks
+ * Copyright 2018 Nokia Solutions and Networks
  * Licensed under the Apache License, Version 2.0,
  * see license.txt file for details.
  */

diff --git a/...tions/src/main/java/org/rf/ide/core/testdata/mapping/testcases/TestCaseTagsMapperOld.java b/...tions/src/main/java/org/rf/ide/core/testdata/mapping/testcases/TestCaseTagsMapperOld.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Nokia Solutions and Networks
+ * Copyright 2018 Nokia Solutions and Networks
  * Licensed under the Apache License, Version 2.0,
  * see license.txt file for details.
  */

diff --git a/...s/src/main/java/org/rf/ide/core/testdata/mapping/testcases/TestCaseTeardownMapperOld.java b/...s/src/main/java/org/rf/ide/core/testdata/mapping/testcases/TestCaseTeardownMapperOld.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Nokia Solutions and Networks
+ * Copyright 2018 Nokia Solutions and Networks
  * Licensed under the Apache License, Version 2.0,
  * see license.txt file for details.
  */

diff --git a/...c/main/java/org/rf/ide/core/testdata/mapping/testcases/TestCaseTemplateKeywordMapper.java b/...c/main/java/org/rf/ide/core/testdata/mapping/testcases/TestCaseTemplateKeywordMapper.java
@@ -31,12 +31,12 @@ public boolean checkIfCanBeMapped(final RobotFileOutput robotFileOutput, final R
         if (stateHelper.getCurrentStatus(processingState) == ParsingState.TEST_CASE_SETTING_TEST_TEMPLATE) {
             final List<TestCase> tests = robotFileOutput.getFileModel().getTestCaseTable().getTestCases();
             final List<TestCaseTemplate> templates = tests.get(tests.size() - 1).getTemplates();
-            return !checkIfHasAlreadyKeywordName(templates);
+            return !hasKeywordNameAlready(templates);
         }
         return false;
     }
 
-    private boolean checkIfHasAlreadyKeywordName(final List<TestCaseTemplate> templates) {
+    private boolean hasKeywordNameAlready(final List<TestCaseTemplate> templates) {
         return !templates.isEmpty() && templates.get(templates.size() - 1).getKeywordName() != null;
     }
 

diff --git a/...s/src/main/java/org/rf/ide/core/testdata/mapping/testcases/TestCaseTemplateMapperOld.java b/...s/src/main/java/org/rf/ide/core/testdata/mapping/testcases/TestCaseTemplateMapperOld.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Nokia Solutions and Networks
+ * Copyright 2018 Nokia Solutions and Networks
  * Licensed under the Apache License, Version 2.0,
  * see license.txt file for details.
  */

diff --git a/...ns/src/main/java/org/rf/ide/core/testdata/mapping/testcases/TestCaseTimeoutMapperOld.java b/...ns/src/main/java/org/rf/ide/core/testdata/mapping/testcases/TestCaseTimeoutMapperOld.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Nokia Solutions and Networks
+ * Copyright 2018 Nokia Solutions and Networks
  * Licensed under the Apache License, Version 2.0,
  * see license.txt file for details.
  */

diff --git a/...rc/main/java/org/rf/ide/core/testdata/mapping/testcases/TestCaseTimeoutMessageMapper.java b/...rc/main/java/org/rf/ide/core/testdata/mapping/testcases/TestCaseTimeoutMessageMapper.java
@@ -33,13 +33,13 @@ public boolean checkIfCanBeMapped(final RobotFileOutput robotFileOutput, final R
         if (currentState == ParsingState.TEST_CASE_SETTING_TEST_TIMEOUT) {
             final List<TestCase> testCases = robotFileOutput.getFileModel().getTestCaseTable().getTestCases();
             final List<TestCaseTimeout> timeouts = testCases.get(testCases.size() - 1).getTimeouts();
-            return checkIfHasAlreadyValue(timeouts);
+            return hasValueAlready(timeouts);
         }
         return currentState == ParsingState.TEST_CASE_SETTING_TEST_TIMEOUT_VALUE
                 || currentState == ParsingState.TEST_CASE_SETTING_TEST_TIMEOUT_MESSAGE_ARGUMENTS;
     }
 
-    private boolean checkIfHasAlreadyValue(final List<TestCaseTimeout> testCaseTimeouts) {
+    private boolean hasValueAlready(final List<TestCaseTimeout> testCaseTimeouts) {
         return !testCaseTimeouts.isEmpty() && testCaseTimeouts.get(testCaseTimeouts.size() - 1).getTimeout() != null;
     }
 

diff --git a/.../src/main/java/org/rf/ide/core/testdata/mapping/testcases/TestCaseTimeoutValueMapper.java b/.../src/main/java/org/rf/ide/core/testdata/mapping/testcases/TestCaseTimeoutValueMapper.java
@@ -31,12 +31,12 @@ public boolean checkIfCanBeMapped(final RobotFileOutput robotFileOutput, final R
         if (utility.getCurrentStatus(processingState) == ParsingState.TEST_CASE_SETTING_TEST_TIMEOUT) {
             final List<TestCase> tests = robotFileOutput.getFileModel().getTestCaseTable().getTestCases();
             final List<TestCaseTimeout> timeouts = tests.get(tests.size() - 1).getTimeouts();
-            return !checkIfHasAlreadyValue(timeouts);
+            return !hasValueAlready(timeouts);
         }
         return false;
     }
 
-    private boolean checkIfHasAlreadyValue(final List<TestCaseTimeout> testCaseTimeouts) {
+    private boolean hasValueAlready(final List<TestCaseTimeout> testCaseTimeouts) {
         return !testCaseTimeouts.isEmpty() && testCaseTimeouts.get(testCaseTimeouts.size() - 1).getTimeout() != null;
     }
 

diff --git a/...ions/src/main/java/org/rf/ide/core/testdata/model/table/MultipleSettingsViewsCreator.java b/...ions/src/main/java/org/rf/ide/core/testdata/model/table/MultipleSettingsViewsCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Nokia Solutions and Networks
+ * Copyright 2018 Nokia Solutions and Networks
  * Licensed under the Apache License, Version 2.0,
  * see license.txt file for details.
  */

diff --git a/...ns/src/main/java/org/rf/ide/core/testdata/model/table/setting/views/TestTemplateView.java b/...ns/src/main/java/org/rf/ide/core/testdata/model/table/setting/views/TestTemplateView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Nokia Solutions and Networks
+ * Copyright 2018 Nokia Solutions and Networks
  * Licensed under the Apache License, Version 2.0,
  * see license.txt file for details.
  */