From 8696e1253e84dcc914d5ddbd32160c447a9701bf Mon Sep 17 00:00:00 2001
From: "Brian S. O'Neill" <bronee@gmail.com>
Date: Wed, 11 Oct 2006 16:16:15 +0000
Subject: Resolved some warnings.

---
 .../java/com/amazon/carbonado/spi/AbstractRepositoryBuilder.java     | 3 ---
 src/main/java/com/amazon/carbonado/spi/BelatedStorageCreator.java    | 2 --
 src/main/java/com/amazon/carbonado/spi/MasterStorableGenerator.java  | 2 --
 src/main/java/com/amazon/carbonado/spi/StorableGenerator.java        | 5 ++---
 src/main/java/com/amazon/carbonado/spi/TriggerManager.java           | 2 +-
 src/main/java/com/amazon/carbonado/spi/WrappedStorage.java           | 2 --
 6 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'src/main/java/com/amazon/carbonado/spi')

diff --git a/src/main/java/com/amazon/carbonado/spi/AbstractRepositoryBuilder.java b/src/main/java/com/amazon/carbonado/spi/AbstractRepositoryBuilder.java
index ed4eaf3..6193e50 100644
--- a/src/main/java/com/amazon/carbonado/spi/AbstractRepositoryBuilder.java
+++ b/src/main/java/com/amazon/carbonado/spi/AbstractRepositoryBuilder.java
@@ -22,15 +22,12 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashSet;
-import java.util.List;
-
 import java.util.concurrent.atomic.AtomicReference;
 
 import com.amazon.carbonado.ConfigurationException;
 import com.amazon.carbonado.Repository;
 import com.amazon.carbonado.RepositoryBuilder;
 import com.amazon.carbonado.RepositoryException;
-import com.amazon.carbonado.Trigger;
 import com.amazon.carbonado.TriggerFactory;
 
 /**
diff --git a/src/main/java/com/amazon/carbonado/spi/BelatedStorageCreator.java b/src/main/java/com/amazon/carbonado/spi/BelatedStorageCreator.java
index 88d0f61..a23ed97 100644
--- a/src/main/java/com/amazon/carbonado/spi/BelatedStorageCreator.java
+++ b/src/main/java/com/amazon/carbonado/spi/BelatedStorageCreator.java
@@ -29,8 +29,6 @@ import com.amazon.carbonado.SupportException;
 import com.amazon.carbonado.Trigger;
 
 import com.amazon.carbonado.filter.Filter;
-import com.amazon.carbonado.filter.FilterValues;
-
 import com.amazon.carbonado.util.BelatedCreator;
 
 /**
diff --git a/src/main/java/com/amazon/carbonado/spi/MasterStorableGenerator.java b/src/main/java/com/amazon/carbonado/spi/MasterStorableGenerator.java
index 317aac6..1d9b7c5 100644
--- a/src/main/java/com/amazon/carbonado/spi/MasterStorableGenerator.java
+++ b/src/main/java/com/amazon/carbonado/spi/MasterStorableGenerator.java
@@ -39,7 +39,6 @@ import com.amazon.carbonado.OptimisticLockException;
 import com.amazon.carbonado.PersistException;
 import com.amazon.carbonado.Repository;
 import com.amazon.carbonado.Storable;
-import com.amazon.carbonado.Storage;
 import com.amazon.carbonado.SupportException;
 import com.amazon.carbonado.Transaction;
 
@@ -211,7 +210,6 @@ public final class MasterStorableGenerator<S extends Storable> {
     private void generateClass() throws SupportException {
         // Declare some types.
         final TypeDesc storableType = TypeDesc.forClass(Storable.class);
-        final TypeDesc storageType = TypeDesc.forClass(Storage.class);
         final TypeDesc triggerSupportType = TypeDesc.forClass(TriggerSupport.class);
         final TypeDesc masterSupportType = TypeDesc.forClass(MasterSupport.class);
         final TypeDesc transactionType = TypeDesc.forClass(Transaction.class);
diff --git a/src/main/java/com/amazon/carbonado/spi/StorableGenerator.java b/src/main/java/com/amazon/carbonado/spi/StorableGenerator.java
index dff5a0d..bbaa7ba 100644
--- a/src/main/java/com/amazon/carbonado/spi/StorableGenerator.java
+++ b/src/main/java/com/amazon/carbonado/spi/StorableGenerator.java
@@ -53,9 +53,6 @@ import com.amazon.carbonado.Transaction;
 import com.amazon.carbonado.Trigger;
 import com.amazon.carbonado.UniqueConstraintException;
 
-import com.amazon.carbonado.capability.Capability;
-import com.amazon.carbonado.capability.StorableInfoCapability;
-
 import com.amazon.carbonado.lob.Lob;
 
 import com.amazon.carbonado.info.ChainedProperty;
@@ -2251,6 +2248,7 @@ public final class StorableGenerator<S extends Storable> {
      * For the given join property, marks all of its dependent internal join
      * element properties as dirty.
      */
+    /*
     private void markInternalJoinElementsDirty(CodeBuilder b, StorableProperty joinProperty) {
         int count = mAllProperties.size();
 
@@ -2278,6 +2276,7 @@ public final class StorableGenerator<S extends Storable> {
             }
         }
     }
+    */
 
     /**
      * Generates code to set all state properties to zero.
diff --git a/src/main/java/com/amazon/carbonado/spi/TriggerManager.java b/src/main/java/com/amazon/carbonado/spi/TriggerManager.java
index 60661d1..ea7ae4f 100644
--- a/src/main/java/com/amazon/carbonado/spi/TriggerManager.java
+++ b/src/main/java/com/amazon/carbonado/spi/TriggerManager.java
@@ -229,7 +229,7 @@ public class TriggerManager<S extends Storable> {
         }
 
         if (overridesMethod(triggerClass, BEFORE_UPDATE_METHOD) ||
-            overridesMethod(triggerClass, BEFORE_TRY_INSERT_METHOD) ||
+            overridesMethod(triggerClass, BEFORE_TRY_UPDATE_METHOD) ||
             overridesMethod(triggerClass, AFTER_UPDATE_METHOD) ||
             overridesMethod(triggerClass, AFTER_TRY_UPDATE_METHOD) ||
             overridesMethod(triggerClass, FAILED_UPDATE_METHOD))
diff --git a/src/main/java/com/amazon/carbonado/spi/WrappedStorage.java b/src/main/java/com/amazon/carbonado/spi/WrappedStorage.java
index 1cefc73..ebe0c19 100644
--- a/src/main/java/com/amazon/carbonado/spi/WrappedStorage.java
+++ b/src/main/java/com/amazon/carbonado/spi/WrappedStorage.java
@@ -28,8 +28,6 @@ import com.amazon.carbonado.Trigger;
 import com.amazon.carbonado.TriggerFactory;
 
 import com.amazon.carbonado.filter.Filter;
-import com.amazon.carbonado.filter.FilterValues;
-
 import com.amazon.carbonado.util.QuickConstructorGenerator;
 
 /**
-- 
cgit v1.2.3