Revize 27ba3ec6

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

src/data/Bitmap.java

@@ -7 +7 @@
 import java.time.temporal.WeekFields;
 import java.util.Arrays;
 import java.util.Locale;
+import java.util.Objects;
 
 /**
  *
@@ -16 +17 @@
  * @version 1.0
  *
  */
-public class Bitmap {
+public class Bitmap implements Comparable<Bitmap>{
 
     //-------------- Atributy --------------/
 
@@ -456 +457 @@
             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 '1': if (day.getDayOfWeek() == DayOfWeek.MONDAY) 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;
                 case '4': if (day.getDayOfWeek() == DayOfWeek.THURSDAY) return true; break;
@@ -590 +591 @@
      * @param year Rok pro vypocet velikonocnich svatku
      */
     public void getEasterHolidays(int year) {
-        int Y = year;
-        int a = Y % 19;
-        int b = Y / 100;
-        int c = Y % 100;
+        int a = year % 19;
+        int b = year / 100;
+        int c = year % 100;
         int d = b / 4;
         int e = b % 4;
         int f = (b + 8) / 25;
@@ -870 +870 @@
     }
 
 
+    /**
+     * Porovnava bitmapy podle jejich atributu pro serazeni podle hodnot
+     * @param o bitmapa k porovnani se stavajici
+     * @return 0 - kdyz jsou bitmapy stejne
+     *         1 - kdyz je bitmapa "vetsi"
+     *        -1 - kdyz je bitmapa "mensi"
+     */
+    @Override
+    public int compareTo(Bitmap o) {
+
+        if (this.lineNumber.equals(o.lineNumber)) {
+                if(this.lineVersion.equals(o.lineVersion)) {
+                    if (this.timeCode.equals(o.timeCode)) {
+                        if (this.hardCodes.equals(o.hardCodes)) {
+                            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 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 Integer.parseInt(this.lineVersion) - Integer.parseInt(o.lineVersion);
+        }
+        else return Integer.parseInt(this.lineNumber) - Integer.parseInt(o.lineNumber);
+    }
+
+    /**
+     * Porovna objekt s bitmapou a rozhodne zda se jedna o stejnou ci ne
+     * @param obj objekt k porovnani s bitmapou
+     * @return true - kdyz je cela bitmapa stejna
+     *         false - v opacnem pripade
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (obj == null) return false;
+        if(getClass() != obj.getClass()) return false;
+        Bitmap o = (Bitmap) obj;
+        return Objects.equals(lineNumber, o.lineNumber) && Objects.equals(lineVersion, o.lineVersion) &&
+                Objects.equals(timeCode, o.timeCode) && Objects.equals(hardCodes, o.hardCodes) &&
+                Objects.equals(bitmap, o.bitmap);
+    }
+
+
 }
+
+