Add friendlier error message for HidingEnclosingType

rzats · rzats · commit ec9282ec5e0d · 2016-05-08T23:20:41.000+03:00
diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties
@@ -370,6 +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
 
 # 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
@@ -254,6 +254,11 @@ public static String getSimplifiedErrorMessage(Problem problem) {
         result = Language.interpolate("editor.status.no_effect_assignment", args[0]);
       }
       break;
+
+    case IProblem.HidingEnclosingType:
+      if (args.length > 0 && args[0].equals(problem.getClassName())) {
+        result = Language.interpolate("editor.status.hiding_enclosing_type", args[0]);
+      }
     }
 
     //log("Simplified Error Msg: " + result);
diff --git a/java/src/processing/mode/java/pdex/Problem.java b/java/src/processing/mode/java/pdex/Problem.java
@@ -37,6 +37,10 @@ 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
    */
@@ -83,6 +87,7 @@ 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);
@@ -123,6 +128,10 @@ 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
`@@ -254,6 +254,11 @@ public static String getSimplifiedErrorMessage(Problem problem) {`
`254`	`254`	`result = Language.interpolate("editor.status.no_effect_assignment", args[0]);`
`255`	`255`	`}`
`256`	`256`	`break;`
	`257`	`+`
	`258`	`+ case IProblem.HidingEnclosingType:`
	`259`	`+ if (args.length > 0 && args[0].equals(problem.getClassName())) {`
	`260`	`+ result = Language.interpolate("editor.status.hiding_enclosing_type", args[0]);`
	`261`	`+ }`
`257`	`262`	`}`
`258`	`263`
`259`	`264`	`//log("Simplified Error Msg: " + result);`