Adjust Problem changes

rzats · rzats · commit 2caed0d6daff · 2016-05-09T00:48:37.000+03:00
diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties
@@ -370,7 +370,7 @@ editor.status.type_mismatch = Type mismatch, "%s" does not match with "%s"
 editor.status.unused_variable = The value of the local variable "%s" is not used
 editor.status.uninitialized_variable = The local variable "%s" may not have been initialized
 editor.status.no_effect_assignment = The assignment to variable "%s" has no effect
-editor.status.hiding_enclosing_type = The class "%s" cannot have the same name as the name of your sketch
+editor.status.hiding_enclosing_type = The class "%s" cannot have the same name as your sketch or its' enclosing class
 
 # Footer buttons
 editor.footer.errors = Errors
diff --git a/java/src/processing/mode/java/pdex/ErrorMessageSimplifier.java b/java/src/processing/mode/java/pdex/ErrorMessageSimplifier.java
@@ -256,7 +256,7 @@ public static String getSimplifiedErrorMessage(Problem problem) {
       break;
 
     case IProblem.HidingEnclosingType:
-      if (args.length > 0 && args[0].equals(problem.getClassName())) {
+      if (args.length > 0) {
         result = Language.interpolate("editor.status.hiding_enclosing_type", args[0]);
       }
     }
diff --git a/java/src/processing/mode/java/pdex/Problem.java b/java/src/processing/mode/java/pdex/Problem.java
@@ -37,10 +37,6 @@ public class Problem implements ErrorTable.Entry {
    * The IProblem which is being wrapped
    */
   private IProblem iProblem;
-  /**
-   * The class name for the current sketch
-   */
-  private String className;
   /**
    * The tab number to which the error belongs to
    */
@@ -87,7 +83,6 @@ else if(iProblem.isWarning()) {
     }
     this.tabIndex = tabIndex;
     this.lineNumber = lineNumber;
-    this.className = iProblem.getArguments()[0];
     this.message = process(iProblem);
     this.message = ErrorMessageSimplifier.getSimplifiedErrorMessage(this);
     //ErrorMessageSimplifier.getSimplifiedErrorMessage(this);
@@ -128,10 +123,6 @@ public IProblem getIProblem() {
     return iProblem;
   }
 
-  public String getClassName() {
-    return className;
-  }
-
   public int getTabIndex() {
     return tabIndex;
   }

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ public static String getSimplifiedErrorMessage(Problem problem) {`
`256`	`256`	`break;`
`257`	`257`
`258`	`258`	`case IProblem.HidingEnclosingType:`
`259`		`- if (args.length > 0 && args[0].equals(problem.getClassName())) {`
	`259`	`+ if (args.length > 0) {`
`260`	`260`	`result = Language.interpolate("editor.status.hiding_enclosing_type", args[0]);`
`261`	`261`	`}`
`262`	`262`	`}`