Changeset 2231 for trunk

Timestamp:

12/07/17 16:51:30 (7 years ago)

Author:

pharms

Message:

• solved some findbugs issues

Location:

trunk

Files:

• autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDGUIElementSpec.java (modified) (2 diffs)
• autoquest-plugin-genericevents/src/main/java/de/ugoe/cs/autoquest/plugin/genericevents/GenericEventLogParser.java (modified) (1 diff)
• autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/usability/CMDgetTaskModelCrossCoverage.java (modified) (2 diffs)

trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDGUIElementSpec.java

@@ -135 +135 @@
         /*
          * Path and label of the elements fits together. In this case it is most likely that this
-         * elements fits together. This only makes since in the case a label exists.
-         */
-        if (otherSpec.getName() != "NOT_SET" && getName() != "NOT_SET" &&
-            !otherSpec.getName().contains("image:") && getName().contains("image:") &&
-            otherSpec.getName() == getName() && otherSpec.getPath() == getPath())
+         * elements fits together. This only makes sense in the case a label exists.
+         */
+        if (!"NOT_SET".equals(otherSpec.getName()) && !"NOT_SET".equals(getName()) &&
+            !otherSpec.getName().contains("image:") && !getName().contains("image:") &&
+            otherSpec.getName().equals(getName()) && otherSpec.getPath().equals(getPath()))
         {
             return true;
@@ -148 +148 @@
          * together.
          */
-        if (otherSpec.getPath() == getPath() &&
+        if (otherSpec.getPath().equals(getPath()) &&
             otherSpec.getElementPosition() == getElementPosition())
         {

trunk/autoquest-plugin-genericevents/src/main/java/de/ugoe/cs/autoquest/plugin/genericevents/GenericEventLogParser.java

@@ -155 +155 @@
         // year 1 of the gregorian calendar. If this is the case, the date is still in the future.
         // Hence, we substract the milliseconds between year 1 of the gregorian calendar and 1970.
-        // (We took these magic number, as they provide correct results. It's not fully clear,
-        //  why the January 1st 1970 does not work correctly but provides an offset of two days)
         if (val > System.currentTimeMillis()) {
-            Duration duration = Duration.between(new GregorianCalendar(1, 1, 1).toInstant(),
-                                                 new GregorianCalendar(1969, 12, 30).toInstant());
+            Duration duration = Duration.between(new GregorianCalendar(1, 0, 1).toInstant(),
+                                                 new GregorianCalendar(1970, 0, 1).toInstant());
             
             val -= duration.toMillis();

trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/usability/CMDgetTaskModelCrossCoverage.java

@@ -1299 +1299 @@
             }
             
-            return null;
+            throw new IllegalStateException("action type must be one of shift, goto, and reduce");
         }
        
@@ -1608 +1608 @@
         @Override
         public boolean equals(Object obj) {
-            if (((Edge) obj).symbol == null) {
-                System.out.println("blöd");
-            }
-            
             if (this == obj) {
                 return true;