Changeset 1079 for trunk

Timestamp:

02/15/13 16:03:56 (12 years ago)

Author:

pharms

Message:

• prevented findbugs warnings

Location:

trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc

Files:

• JFCReplayIDCalculator.java (modified) (1 diff)
• JFCTraceCorrector.java (modified) (11 diffs)
• guimodel/JFCComponentTree.java (deleted)

trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/JFCReplayIDCalculator.java

@@ -198 +198 @@
                 else{
                         Map<String, String> idProperties = extractIDProperties(spec);
-                        for (String property: idProperties.keySet()){
-                                String value = idProperties.get(property);
+                        for (Map.Entry<String, String> property : idProperties.entrySet()) {
+                                String value = property.getValue();
                                 if (!value.equals("null")){
-                                        hashcode = prime * hashcode + property.hashCode();
+                                        hashcode = prime * hashcode + property.getKey().hashCode();
                                         hashcode = prime * hashcode + value.hashCode();
                                 }

trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/JFCTraceCorrector.java

@@ -195 +195 @@
         
         try {
-            outFile = new PrintStream(new BufferedOutputStream(new FileOutputStream(resultFile)));
+            outFile = new PrintStream
+                (new BufferedOutputStream(new FileOutputStream(resultFile)), false, "UTF-8");
             outFile.println("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
         }
@@ -201 +202 @@
             throw new IllegalArgumentException("could not create a corrected file name " +
                                                resultFile + " next to " + file);
+        }
+        catch (UnsupportedEncodingException e) {
+            throw new IllegalArgumentException("this host does not support UTF-8 encoding");
         }
         
@@ -673 +677 @@
      * </p>
      */
-    private void dumpParams(PrintStream out, List<Parameter> params, String indent) {
+    private static void dumpParams(PrintStream out, List<Parameter> params, String indent) {
         for (Parameter param : params) {
             out.print(indent);
@@ -696 +700 @@
      * @return true if both lists contain the same parameters, false else.
      */
-    private boolean parametersEqual(List<Parameter> params1, List<Parameter> params2) {
+    private static boolean parametersEqual(List<Parameter> params1, List<Parameter> params2) {
         if (params1 == null) {
             return params2 == null;
@@ -734 +738 @@
      * </p> 
      */
-    private class Session {
+    private static class Session {
         
         /** */
@@ -798 +802 @@
      * </p> 
      */
-    private class Event {
+    private static class Event {
 
         /** */
@@ -873 +877 @@
      * </p> 
      */
-    private class Source {
+    private static class Source {
         
         /** */
@@ -984 +988 @@
                 Source other = (Source) obj;
                 
-                if ((getToStringValue() != other.getToStringValue()) ||
-                    ((getToStringValue() != null) &&
-                     (!getToStringValue().equals(other.getToStringValue()))))
+                if (getToStringValue() != null ?
+                      !getToStringValue().equals(other.getToStringValue()) :
+                          other.getToStringValue() != null)
                 {
                     return false;
@@ -1042 +1046 @@
      * </p> 
      */
-    private class Component {
+    private static class Component {
         
         /** */
@@ -1115 +1119 @@
      * </p> 
      */
-    private class ComponentFromToString extends Component {
+    private static class ComponentFromToString extends Component {
         
         /** */
@@ -1238 +1242 @@
      * </p> 
      */
-    private class Parameter {
+    private static class Parameter {
         
         /** */