Revize 13ca7057

Oprava implementace podle potřeb zadavatele, doplnění funkcionality pseudo linek + odstranění redundantních tříd a souborů v3 (Re #7570)

src/data/Bitmap.java

@@ -456 +456 @@
 
             switch (hardCode) {
                 case 'X': if(day.getDayOfWeek() != DayOfWeek.SATURDAY && day.getDayOfWeek() != DayOfWeek.SUNDAY && !isBankHoliday(day)) return true ; break;
-                case '+': if (day.getDayOfWeek() != DayOfWeek.SATURDAY) return true; break;
+                case '+': if (day.getDayOfWeek() == DayOfWeek.SUNDAY || isBankHoliday(day)) return true; break;
                 case '1': if (day.getDayOfWeek() == DayOfWeek.MONDAY) return true;  break;
                 case '2': if (day.getDayOfWeek() == DayOfWeek.TUESDAY) return true; break;
                 case '3': if (day.getDayOfWeek() == DayOfWeek.WEDNESDAY) return true; break;
@@ -887 +887 @@
                             if(Arrays.equals(this.bitmap, o.bitmap)) return 0;
                             else return -1;
                         }
-                        else if (this.hardCodes.equals("") && !o.hardCodes.equals(""))
-                            return -Integer.parseInt(o.hardCodes);
-                        else if (!this.hardCodes.equals("") && o.hardCodes.equals(""))
-                            return Integer.parseInt(this.hardCodes);
-                        else return Integer.parseInt(this.hardCodes) - Integer.parseInt(o.hardCodes);
+                        else return this.hardCodes.compareTo(o.hardCodes);
                     }
-                    else if (this.timeCode.equals("") && !o.timeCode.equals(""))
-                        return -Integer.parseInt(o.timeCode);
-                    else if (!this.timeCode.equals("") && o.timeCode.equals(""))
-                        return Integer.parseInt(this.timeCode);
-                    else return Integer.parseInt(this.timeCode) - Integer.parseInt(o.timeCode);
+                    else return this.timeCode.compareTo(o.timeCode);
                 }
-                else return Integer.parseInt(this.lineVersion) - Integer.parseInt(o.lineVersion);
+                else return this.lineVersion.compareTo(o.lineVersion);
         }
-        else return Integer.parseInt(this.lineNumber) - Integer.parseInt(o.lineNumber);
+        else return this.lineNumber.compareTo(o.lineNumber);
     }
 
     /**