Ticket #2318: more-than-one-text-link.patch

src/main/java/org/sophie2/base/model/text/smart/ImmHotText.java

@@ -949 +949 @@
          *              A {@link Comparator} that compares two positions.
          */
         public Comparator<HotInterval> getIntervalComparator() {
-                return new Comparator<HotInterval>() {
-                        public int compare(HotInterval interval1, HotInterval interval2) {
-                                return getPosComparator().compare(interval1.getBegin(),
-                                                interval2.getBegin());
-                        }
-                };
+                return HotInterval.getComparator(getPosComparator());
         }
 
         /**

src/main/java/org/sophie2/base/model/text/smart/position/HotInterval.java

@@ -125 +125 @@
                 return new Comparator<HotInterval>() {
 
                         public int compare(HotInterval i1, HotInterval i2) {
-                                return posComparator.compare(i1.getBegin(), i2.getBegin());
-                        }
+                                int x = posComparator.compare(i1.getBegin(), i2.getBegin()); 
+                                if (x != 0) { 
+                                        return x; 
+                                }
+                                return posComparator.compare(i1.getEnd(), i2.getEnd()); 
+                        }       
                         
                 };
         }

src/main/java/org/sophie2/main/func/links/LinksHud.java

@@ -472 +472 @@
 
                         @Override
                         protected void setup(Object res) {
-                                holder().get();
+                                if (holder().get() != null) { 
+                                        holder().get().getLink(); 
+                                } 
                                 wantedRule().set(null);
                         }
                 }