Changeset 7926

Timestamp:

Feb 24, 2021, 11:31:05 AM (2 years ago)

Author:

Nicklas Nordborg

Message:

Merge 3.18 to the trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• build.xml (modified) (1 diff)
• credits.txt (modified) (1 diff)
• src/core/net/sf/basedb/core/Application.java (modified) (1 diff)
• src/core/net/sf/basedb/core/PropertyFilter.java (modified) (1 diff)
• src/core/net/sf/basedb/core/Update.java (modified) (1 diff)
• www/common/annotations/annotate.js (modified) (3 diffs)

trunk/build.xml

@@ -69 +69 @@
   <property name="base.minorversion" value="19" />
   <property name="base.maintenanceversion" value="0" />
-  <property name="base.versionsuffix" value="-dev" />
+  <property name="base.versionsuffix" value="" />
   <property name="base.version" 
     value="${base.majorversion}.${base.minorversion}.${base.maintenanceversion}" />

trunk/credits.txt

@@ -1 +1 @@
 $Id$
 
-The current BASE team is (at BASE 3.17 release)
+The current BASE team is (at BASE 3.18 release)
 {{{
 Jari Häkkinen

trunk/src/core/net/sf/basedb/core/Application.java

@@ -428 +428 @@
   /**
     Starts the BASE application.
-    @param installation TRUE if we are starting the application for
-      installation, FALSE for a normal start
+    @param options Options for how BASE should be started
     @throws BaseException If BASE cannot be started
     @see #start()

trunk/src/core/net/sf/basedb/core/PropertyFilter.java

@@ -553 +553 @@
       is ignored by the BASE core code. The rest of the property should be a unique
       identifier for the extension that is handling the filter.
+    </ul>
     <p>
     The property may also start with $@.

trunk/src/core/net/sf/basedb/core/Update.java

@@ -454 +454 @@
     <td>
       Added {@link ItemListSyncFilterData#getFilterGroup()}, {@link ItemListSyncFilterData#getLastSyncProperties()},
-      {@link ItemListData#getSizeAtLastSync()}, {@link ItemListData#getMd5AtLastSync(). 
+      {@link ItemListData#getSizeAtLastSync()}, {@link ItemListData#getMd5AtLastSync()}. 
       The update will set the filterGroup value to 'A+' for all existing filters and generate a lastSyncProperties value from
       current settings. The update will also set sizeAtLastSync to -1 for existing item lists.

trunk/www/common/annotations/annotate.js

@@ -244 +244 @@
       }
       
+      entry.visible = show;
       Doc.showHide(entry.id, show);
     }
@@ -751 +752 @@
     {
       var entry = annotations[i];
-      if (entry.source == 'PRIMARY')
+      if (entry.visible && entry.source == 'PRIMARY')
       {
         var checkbox = Doc.element('check.'+entry.id);
@@ -774 +775 @@
     {
       var entry = annotations[i];
-      if (entry.source != 'PRIMARY')
+      if (entry.visible && entry.source != 'PRIMARY')
       {
         var checkbox = Doc.element('check.'+entry.id);