0005188: Made changes necessary to overhaul settings button

JumpMind · Jan 13, 2022 · b0d659e · b0d659e
1 parent e7333d9
commit b0d659e
Show file tree

Hide file tree

Showing 19 changed files with 69 additions and 26 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Extension.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Extension.java
@@ -20,10 +20,9 @@
  */
 package org.jumpmind.symmetric.model;
 
-import java.io.Serializable;
 import java.util.Date;
 
-public class Extension implements Serializable {
+public class Extension implements IModelObject {
     private static final long serialVersionUID = 1L;
     public static String EXTENSION_TYPE_JAVA = "java";
     public static String EXTENSION_TYPE_BSH = "bsh";

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/FileTrigger.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/FileTrigger.java
@@ -21,7 +21,6 @@
 package org.jumpmind.symmetric.model;
 
 import java.io.File;
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -35,7 +34,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.jumpmind.symmetric.common.Constants;
 
-public class FileTrigger implements Serializable {
+public class FileTrigger implements IModelObject {
     private static final long serialVersionUID = 1L;
     private String triggerId;
     private String channelId = Constants.CHANNEL_FILESYNC;

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/FileTriggerRouter.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/FileTriggerRouter.java
@@ -20,10 +20,9 @@
  */
 package org.jumpmind.symmetric.model;
 
-import java.io.Serializable;
 import java.util.Date;
 
-public class FileTriggerRouter implements Serializable {
+public class FileTriggerRouter implements IModelObject {
     private static final long serialVersionUID = 1L;
     private FileTrigger fileTrigger;
     private Router router;

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Grouplet.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Grouplet.java
@@ -26,7 +26,9 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-public class Grouplet {
+public class Grouplet implements IModelObject {
+    private static final long serialVersionUID = 1L;
+
     public enum GroupletLinkPolicy {
         I, E
     };

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/IModelObject.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/IModelObject.java
@@ -0,0 +1,38 @@
+/**
+ * Licensed to JumpMind Inc under one or more contributor
+ * license agreements.  See the NOTICE file distributed
+ * with this work for additional information regarding
+ * copyright ownership.  JumpMind Inc licenses this file
+ * to you under the GNU General Public License, version 3.0 (GPLv3)
+ * (the "License"); you may not use this file except in compliance
+ * with the License.
+ *
+ * You should have received a copy of the GNU General Public License,
+ * version 3.0 (GPLv3) along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jumpmind.symmetric.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public interface IModelObject extends Serializable {
+    public Date getCreateTime();
+
+    public void setCreateTime(Date createTime);
+
+    public String getLastUpdateBy();
+
+    public void setLastUpdateBy(String lastUpdateBy);
+
+    public Date getLastUpdateTime();
+
+    public void setLastUpdateTime(Date lastUpdateTime);
+}
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/JobDefinition.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/JobDefinition.java
@@ -25,7 +25,9 @@
 import org.apache.commons.lang3.math.NumberUtils;
 import org.jumpmind.symmetric.io.data.CsvData;
 
-public class JobDefinition {
+public class JobDefinition implements IModelObject {
+    private static final long serialVersionUID = 1L;
+
     public enum JobType {
         BUILT_IN, BSH, JAVA, SQL
     }

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/LoadFilter.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/LoadFilter.java
@@ -20,10 +20,9 @@
  */
 package org.jumpmind.symmetric.model;
 
-import java.io.Serializable;
 import java.util.Date;
 
-public class LoadFilter implements Serializable {
+public class LoadFilter implements IModelObject {
     private static final long serialVersionUID = 1L;
 
     public enum LoadFilterType {

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Monitor.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Monitor.java
@@ -26,7 +26,8 @@
 
 import org.jumpmind.symmetric.common.ParameterConstants;
 
-public class Monitor {
+public class Monitor implements IModelObject {
+    private static final long serialVersionUID = 1L;
     public static final int INFO = 100;
     public static final int WARNING = 200;
     public static final int SEVERE = 300;

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/NodeChannel.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/NodeChannel.java
@@ -20,14 +20,13 @@
  */
 package org.jumpmind.symmetric.model;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
 /**
  * A composite parent for {@link Channel} and {@link NodeChannelControl}
  */
-public class NodeChannel implements Serializable {
+public class NodeChannel implements IModelObject {
     private static final long serialVersionUID = 1L;
     private Channel channel;
     private NodeChannelControl nodeChannelControl;

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/NodeGroup.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/NodeGroup.java
@@ -20,10 +20,9 @@
  */
 package org.jumpmind.symmetric.model;
 
-import java.io.Serializable;
 import java.util.Date;
 
-public class NodeGroup implements Serializable {
+public class NodeGroup implements IModelObject {
     private static final long serialVersionUID = 1L;
     private String nodeGroupId;
     private String description;

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/NodeGroupLink.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/NodeGroupLink.java
@@ -20,10 +20,9 @@
  */
 package org.jumpmind.symmetric.model;
 
-import java.io.Serializable;
 import java.util.Date;
 
-public class NodeGroupLink implements Serializable, Comparable<NodeGroupLink> {
+public class NodeGroupLink implements IModelObject, Comparable<NodeGroupLink> {
     private static final long serialVersionUID = 1L;
     private String sourceNodeGroupId;
     private String targetNodeGroupId;

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Notification.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Notification.java
@@ -24,7 +24,8 @@
 
 import org.jumpmind.symmetric.common.ParameterConstants;
 
-public class Notification {
+public class Notification implements IModelObject {
+    private static final long serialVersionUID = 1L;
     private String notificationId;
     private String nodeGroupId;
     private String externalId;

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Router.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Router.java
@@ -20,7 +20,6 @@
  */
 package org.jumpmind.symmetric.model;
 
-import java.io.Serializable;
 import java.util.Date;
 
 import org.apache.commons.lang3.StringUtils;
@@ -29,7 +28,7 @@
 /**
  * Metadata about how and when to route data to a node group or a specific node
  */
-public class Router implements Serializable, Cloneable {
+public class Router implements IModelObject, Cloneable {
     private static final long serialVersionUID = 1L;
     private static int maxRouterId;
     private String routerId;

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Trigger.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Trigger.java
@@ -20,7 +20,6 @@
  */
 package org.jumpmind.symmetric.model;
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -38,7 +37,7 @@
 /**
  * Defines the trigger via which a table will be synchronized.
  */
-public class Trigger implements Serializable, Cloneable {
+public class Trigger implements IModelObject, Cloneable {
     private static final long serialVersionUID = 1L;
     private static final Logger log = LoggerFactory.getLogger(Trigger.class);
     private static final String DEFAULT_CONDITION = "1=1";

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/TriggerRouter.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/TriggerRouter.java
@@ -20,7 +20,6 @@
  */
 package org.jumpmind.symmetric.model;
 
-import java.io.Serializable;
 import java.util.Date;
 
 import org.apache.commons.lang3.StringUtils;
@@ -29,7 +28,7 @@
 /**
  * Defines the trigger via which a table will be synchronized.
  */
-public class TriggerRouter implements Serializable, Cloneable {
+public class TriggerRouter implements IModelObject, Cloneable {
     private static final long serialVersionUID = 1L;
     private boolean enabled = true;
     /**

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java
@@ -105,6 +105,7 @@
 import org.jumpmind.symmetric.model.AbstractBatch.Status;
 import org.jumpmind.symmetric.model.Channel;
 import org.jumpmind.symmetric.model.ChannelMap;
+import org.jumpmind.symmetric.model.IModelObject;
 import org.jumpmind.symmetric.model.IncomingBatch;
 import org.jumpmind.symmetric.model.IncomingError;
 import org.jumpmind.symmetric.model.LoadFilter;
@@ -1126,7 +1127,7 @@ public boolean isDone() throws Throwable {
         }
     }
 
-    public static class ConflictNodeGroupLink extends Conflict {
+    public static class ConflictNodeGroupLink extends Conflict implements IModelObject {
         private static final long serialVersionUID = 1L;
         protected NodeGroupLink nodeGroupLink;
 

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TransformService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TransformService.java
@@ -69,6 +69,7 @@
 import org.jumpmind.symmetric.io.data.transform.TrimColumnTransform;
 import org.jumpmind.symmetric.io.data.transform.ValueMapColumnTransform;
 import org.jumpmind.symmetric.io.data.transform.VariableColumnTransform;
+import org.jumpmind.symmetric.model.IModelObject;
 import org.jumpmind.symmetric.model.NodeGroupLink;
 import org.jumpmind.symmetric.security.INodePasswordFilter;
 import org.jumpmind.symmetric.service.IConfigurationService;
@@ -561,7 +562,8 @@ public TransformColumn mapRow(Row rs) {
         }
     }
 
-    public static class TransformTableNodeGroupLink extends TransformTable {
+    public static class TransformTableNodeGroupLink extends TransformTable implements IModelObject {
+        private static final long serialVersionUID = 1L;
         protected NodeGroupLink nodeGroupLink;
         protected boolean bound;
 

diff --git a/...tric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/ColumnVisibilityToggler.java b/...tric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/ColumnVisibilityToggler.java
@@ -63,6 +63,11 @@ public Column<?> addColumn(Column<?> column, String header) {
         return column;
     }
 
+    public void removeColumn(Column<?> column) {
+        columnMap.remove(column);
+        rebuildMenuItems();
+    }
+
     public boolean isEmpty() {
         return columnMap.isEmpty();
     }

diff --git a/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/TabSheet.java b/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/TabSheet.java
@@ -67,6 +67,7 @@ public TabSheet() {
                     if (l != null && l.size() > 0) {
                         l.get(0).setVisible(true);
                     } else {
+                        component.setVisible(true);
                         content.add(component);
                     }
                 }