From 52739154902f94dc1c6a8d8ae4dc4a7e2d620394 Mon Sep 17 00:00:00 2001
From: chenson42 <chenson42@gmail.com>
Date: Sat, 14 Nov 2009 01:05:15 +0000
Subject: [PATCH] Change the name of the accessor method to match the database.

---
 .../java/org/jumpmind/symmetric/model/Channel.java | 14 +++++++-------
 .../org/jumpmind/symmetric/model/NodeChannel.java  |  6 +++---
 .../jumpmind/symmetric/model/OutgoingBatches.java  |  2 +-
 .../service/impl/ConfigurationService.java         | 10 +++++-----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/model/Channel.java b/symmetric/src/main/java/org/jumpmind/symmetric/model/Channel.java
index 3b0041ca7b..07ad03a501 100644
--- a/symmetric/src/main/java/org/jumpmind/symmetric/model/Channel.java
+++ b/symmetric/src/main/java/org/jumpmind/symmetric/model/Channel.java
@@ -30,7 +30,7 @@ public class Channel {
 
     private static final long serialVersionUID = -8183376200537307264L;
 
-    private String id;
+    private String channelId;
 
     private int processingOrder;
 
@@ -48,7 +48,7 @@ public Channel() {
     }
 
     public Channel(String id, int processingOrder) {
-        this.id = id;
+        this.channelId = id;
         this.processingOrder = processingOrder;
     }
 
@@ -61,12 +61,12 @@ public Channel(String id, int processingOrder, int maxBatchSize, int maxBatchToS
         this.extractPeriodMillis = extractPeriodMillis;
     }
 
-    public String getId() {
-        return id;
+    public String getChannelId() {
+        return channelId;
     }
 
-    public void setId(String id) {
-        this.id = id;
+    public void setChannelId(String id) {
+        this.channelId = id;
     }
 
     public int getProcessingOrder() {
@@ -110,7 +110,7 @@ public void setMaxBatchToSend(int maxBatchToSend) {
     public boolean isInList(Collection<? extends NodeChannel> channels) {
         if (channels != null) {
             for (NodeChannel channel : channels) {
-                if (channel.getId().equals(id)) {
+                if (channel.getId().equals(channelId)) {
                     return true;
                 }
             }
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/model/NodeChannel.java b/symmetric/src/main/java/org/jumpmind/symmetric/model/NodeChannel.java
index eb88dd23a5..efbab53baa 100644
--- a/symmetric/src/main/java/org/jumpmind/symmetric/model/NodeChannel.java
+++ b/symmetric/src/main/java/org/jumpmind/symmetric/model/NodeChannel.java
@@ -36,11 +36,11 @@ public NodeChannel() {
     public NodeChannel(String channelId) {
         channel = new Channel();
         nodeChannelControl = new NodeChannelControl();
-        channel.setId(channelId);
+        channel.setChannelId(channelId);
     }
 
     public String getId() {
-        return channel.getId();
+        return channel.getChannelId();
     }
 
     public int getMaxBatchSize() {
@@ -112,7 +112,7 @@ public void setProcessingOrder(int priority) {
     }
 
     public void setId(String id) {
-        channel.setId(id);
+        channel.setChannelId(id);
     }
 
     public void setSuspended(boolean suspended) {
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/model/OutgoingBatches.java b/symmetric/src/main/java/org/jumpmind/symmetric/model/OutgoingBatches.java
index 5f754624e5..7fc2387e94 100644
--- a/symmetric/src/main/java/org/jumpmind/symmetric/model/OutgoingBatches.java
+++ b/symmetric/src/main/java/org/jumpmind/symmetric/model/OutgoingBatches.java
@@ -111,7 +111,7 @@ public List<OutgoingBatch> filterBatchesForChannels(Set<String> channels) {
     public List<OutgoingBatch> getBatchesForChannel(Channel channel) {
         List<OutgoingBatch> batchList = new ArrayList<OutgoingBatch>();
         if (channel != null) {
-            batchList = getBatchesForChannel(channel.getId());
+            batchList = getBatchesForChannel(channel.getChannelId());
         }
         return batchList;
     }
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationService.java b/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationService.java
index 0c0adc97ab..186e7f34e9 100644
--- a/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationService.java
+++ b/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationService.java
@@ -79,8 +79,8 @@ public List<NodeGroupLink> getGroupLinksFor(String nodeGroupId) {
     public void saveChannel(Channel channel, boolean reloadChannels) {
         if (0 == jdbcTemplate.update(getSql("updateChannelSql"), new Object[] { channel.getProcessingOrder(),
                 channel.getMaxBatchSize(), channel.getMaxBatchToSend(), channel.isEnabled() ? 1 : 0,
-                channel.getBatchAlgorithm(), channel.getExtractPeriodMillis(), channel.getId() })) {
-            jdbcTemplate.update(getSql("insertChannelSql"), new Object[] { channel.getId(),
+                channel.getBatchAlgorithm(), channel.getExtractPeriodMillis(), channel.getChannelId() })) {
+            jdbcTemplate.update(getSql("insertChannelSql"), new Object[] { channel.getChannelId(),
                     channel.getProcessingOrder(), channel.getMaxBatchSize(), channel.getMaxBatchToSend(),
                     channel.isEnabled() ? 1 : 0, channel.getBatchAlgorithm(), channel.getExtractPeriodMillis() });
         }
@@ -112,7 +112,7 @@ public void saveNodeChannelControl(NodeChannel nodeChannel, boolean reloadChanne
     }
 
     public void deleteChannel(Channel channel) {
-        jdbcTemplate.update(getSql("deleteChannelSql"), new Object[] { channel.getId() });
+        jdbcTemplate.update(getSql("deleteChannelSql"), new Object[] { channel.getChannelId() });
     }
 
     public NodeChannel getNodeChannel(String channelId) {
@@ -242,10 +242,10 @@ protected void autoConfigChannels() {
             List<NodeChannel> channels = getNodeChannels();
             for (Channel defaultChannel : defaultChannels) {
                 if (!defaultChannel.isInList(channels)) {
-                    log.info("ChannelAutoConfiguring", defaultChannel.getId());
+                    log.info("ChannelAutoConfiguring", defaultChannel.getChannelId());
                     saveChannel(defaultChannel, true);
                 } else {
-                    log.info("ChannelExists", defaultChannel.getId());
+                    log.info("ChannelExists", defaultChannel.getChannelId());
                 }
             }
             reloadChannels();