Merge branch 'fix-eclipse-warnings'

plugins/net.jcip.annotations/build.properties

@@ -7,10 +7,6 @@ bin.includes = META-INF/,\
                jcip-annotations.jar,\
                plugin.properties,\
                LEGAL.txt
-src.includes = plugin.properties,\
-               jcip-annotations.jar,\
+src.includes = jcip-annotations.jar,\
                jcip-annotations-src.jar,\
-               META-INF/,\
                LEGAL.txt
-output.. = bin/
-source.. = src/

plugins/net.sf.saxon/build.properties

@@ -8,7 +8,4 @@ bin.includes = *.jar,\
                META-INF/,\
                LEGAL.txt,\
                saxon9he.jar
-output.. = bin/
-source.. = src/
 src.includes = *
-src.excludes = src

plugins/org.apache.poi/build.properties

@@ -9,7 +9,4 @@ bin.includes = poi.jar,\
                plugin.properties,\
                META-INF/,\
                LEGAL.txt
-output.. = bin/
-source.. = src/
 src.includes = *
-src.excludes = src

plugins/org.jaxen/build.properties

@@ -10,14 +10,7 @@ bin.includes = plugin.properties,\
                saxpath.jar,\
                LEGAL.txt
 src.includes = saxpath.jar,\
-               plugin.properties,\
                jaxen.readme,\
                jaxen.license,\
                jaxen-jdom.jar,\
-               jaxen-core.jar,\
-               build.properties,\
-               META-INF/,\
-               .project,\
-               .classpath
-output.. = bin/
-source.. = src/
+               jaxen-core.jar

plugins/org.mockito/build.properties

@@ -7,4 +7,3 @@ bin.includes = plugin.properties,\
 output.. = bin/
 source.. = src/
 src.includes = *
-src.excludes = src

plugins/org.teiid.core.designer/build.properties

@@ -9,5 +9,4 @@ bin.includes = plugin.properties,\
                META-INF/,\
                LEGAL.txt,\
                .
-src.includes = src/
 

plugins/org.teiid.core.designer/src/org/teiid/core/event/AbstractEventBroker.java

@@ -97,7 +97,8 @@ public void addListener( EventObjectListener listener ) {
         super.addListener(listener);
     }
 
-    public void processEvent( EventObject obj ) {
+    @Override
+	public void processEvent( EventObject obj ) {
         // Do not allow an event to be processed if the event broker is shutdown
         assertReady();
         if (obj != null) {

plugins/org.teiid.core.designer/src/org/teiid/core/event/AbstractEventSource.java

@@ -26,7 +26,8 @@ abstract public class AbstractEventSource implements EventSource {
     Map eventClassListeners = new HashMap(5);
     List eventListeners = new ArrayList(5);
 
-    public synchronized void addListener( Class eventClass,
+    @Override
+	public synchronized void addListener( Class eventClass,
                                           EventObjectListener listener ) {
         CoreArgCheck.isNotNull(listener, LISTENER_MAY_NOT_BE_NULL);
         CoreArgCheck.isNotNull(eventClass, EVENT_CLASS_MAY_NOT_BE_NULL);
@@ -50,7 +51,8 @@ public synchronized void addListener( EventObjectListener listener ) {
         }
     }
 
-    public synchronized void removeListener( Class eventClass,
+    @Override
+	public synchronized void removeListener( Class eventClass,
                                              EventObjectListener listener ) {
         CoreArgCheck.isNotNull(listener, LISTENER_MAY_NOT_BE_NULL);
         CoreArgCheck.isNotNull(eventClass, EVENT_CLASS_MAY_NOT_BE_NULL);
@@ -61,7 +63,8 @@ public synchronized void removeListener( Class eventClass,
         }
     }
 
-    public synchronized void removeListener( EventObjectListener listener ) {
+    @Override
+	public synchronized void removeListener( EventObjectListener listener ) {
         CoreArgCheck.isNotNull(listener, LISTENER_MAY_NOT_BE_NULL);
 
         eventListeners.remove(listener);

plugins/org.teiid.core.designer/src/org/teiid/core/id/IntegerID.java

@@ -39,7 +39,8 @@ protected IntegerID(int id) {
      * Get hash code for object
      * @return Hash code
      */
-    public int hashCode() {
+    @Override
+	public int hashCode() {
         return this.id;
     }
 
@@ -51,7 +52,8 @@ public int hashCode() {
      * @param obj the object that this instance is to be compared to.
      * @return whether the object is equal to this object.
      */
-    public boolean equals(Object obj) {
+    @Override
+	public boolean equals(Object obj) {
         // Check if instances are identical ...
         if ( this == obj ) {
             return true;
@@ -82,7 +84,8 @@ public boolean equals(Object obj) {
      * @throws ClassCastException if the specified object's type prevents it
      *      from being compared to this instance.
      */
-    public int compareTo(Object obj) {
+    @Override
+	public int compareTo(Object obj) {
         IntegerID that = (IntegerID) obj;     // May throw ClassCastException
         Assertion.isNotNull(obj);
 
@@ -100,21 +103,24 @@ public int compareTo(Object obj) {
      * Returns a string representing the current state of the object.
      * @return the string representation of this instance.
      */
-    public String toString(){
+    @Override
+	public String toString(){
         return PROTOCOL + ObjectID.DELIMITER + this.id;
     }
     /**
      * @see org.teiid.core.id.ObjectID#toString(char)
      */
-    public String toString(char delim) {
+    @Override
+	public String toString(char delim) {
         return PROTOCOL + delim + this.id;
     }
 
     /**
      * Return the name of the protocol that this factory uses.
      * @return the protocol name
      */
-    public String getProtocol() {
+    @Override
+	public String getProtocol() {
 	    return PROTOCOL;
     }
 

plugins/org.teiid.core.designer/src/org/teiid/core/id/IntegerIDFactory.java

@@ -35,7 +35,8 @@ public IntegerIDFactory() {
      * Return the description for the type of ObjectID described by this object.
      * @return the description
      */
-    public String getDescription() {
+    @Override
+	public String getDescription() {
         return CorePlugin.Util.getString("IntegerIDFactory.Description"); //$NON-NLS-1$
     }
 
@@ -47,7 +48,8 @@ protected int getNextValue() {
      * Create a new ObjectID instance using this protocol.
      * @return the new instance
      */
-    public ObjectID create(){
+    @Override
+	public ObjectID create(){
 	    return new IntegerID( getNextValue() );
     }
     /**
@@ -75,7 +77,8 @@ public boolean validate(ObjectID id) {
      * @throws InvalidIDException if the parser is aware of this protocol, but it is of the wrong
      * format for this type of ObjectID.
      */
-    public ObjectID stringToObject(String value) throws InvalidIDException {
+    @Override
+	public ObjectID stringToObject(String value) throws InvalidIDException {
         final ParsedObjectID parsedID = ParsedObjectID.parsedStringifiedObjectID(value,IntegerID.PROTOCOL);
         try {
 	        return new IntegerID( Integer.parseInt(parsedID.getRemainder()) );
@@ -97,7 +100,8 @@ public ObjectID stringToObject(String value) throws InvalidIDException {
      * @throws InvalidIDException if the parser is aware of this protocol, but it is of the wrong
      * format for this type of ObjectID.
      */
-    public ObjectID stringWithoutProtocolToObject(String value) throws InvalidIDException {
+    @Override
+	public ObjectID stringWithoutProtocolToObject(String value) throws InvalidIDException {
         try {
             return new IntegerID( Integer.parseInt(value) );
         } catch ( NumberFormatException e ) {
@@ -109,7 +113,8 @@ public ObjectID stringWithoutProtocolToObject(String value) throws InvalidIDExce
      * Return the name of the protocol that this factory uses.
      * @return the protocol name
      */
-    public String getProtocol() {
+    @Override
+	public String getProtocol() {
 	    return IntegerID.PROTOCOL;
     }
 }

plugins/org.teiid.core.designer/src/org/teiid/core/id/LongID.java

@@ -39,7 +39,8 @@ protected LongID(long id) {
      * Get hash code for object
      * @return Hash code
      */
-    public int hashCode() {
+    @Override
+	public int hashCode() {
         return (int) this.id;
     }
 
@@ -51,7 +52,8 @@ public int hashCode() {
      * @param obj the object that this instance is to be compared to.
      * @return whether the object is equal to this object.
      */
-    public boolean equals(Object obj) {
+    @Override
+	public boolean equals(Object obj) {
         // Check if instances are identical ...
         if ( this == obj ) {
             return true;
@@ -82,7 +84,8 @@ public boolean equals(Object obj) {
      * @throws ClassCastException if the specified object's type prevents it
      *      from being compared to this instance.
      */
-    public int compareTo(Object obj) {
+    @Override
+	public int compareTo(Object obj) {
         LongID that = (LongID) obj;     // May throw ClassCastException
         Assertion.isNotNull(obj);
 
@@ -100,22 +103,25 @@ public int compareTo(Object obj) {
      * Returns a string representing the current state of the object.
      * @return the string representation of this instance.
      */
-    public String toString(){
+    @Override
+	public String toString(){
         return PROTOCOL + ObjectID.DELIMITER + this.id;
     }
 
     /**
      * @see org.teiid.core.id.ObjectID#toString(char)
      */
-    public String toString(char delim) {
+    @Override
+	public String toString(char delim) {
         return PROTOCOL + delim + this.id;
     }
 
     /**
      * Return the name of the protocol that this factory uses.
      * @return the protocol name
      */
-    public String getProtocol() {
+    @Override
+	public String getProtocol() {
 	    return PROTOCOL;
     }
 

plugins/org.teiid.core.designer/src/org/teiid/core/id/LongIDFactory.java

@@ -36,7 +36,8 @@ public LongIDFactory() {
      * Return the description for the type of ObjectID described by this object.
      * @return the description
      */
-    public String getDescription() {
+    @Override
+	public String getDescription() {
         return CorePlugin.Util.getString("LongIDFactory.Description"); //$NON-NLS-1$
     }
 
@@ -48,7 +49,8 @@ protected long getNextValue() {
      * Create a new ObjectID instance using this protocol.
      * @return the new instance
      */
-    public ObjectID create(){
+    @Override
+	public ObjectID create(){
 	    return new LongID( getNextValue() );
     }
     /**
@@ -80,7 +82,8 @@ public boolean validate(ObjectID id) {
      * @throws InvalidIDException if the parser is aware of this protocol, but it is of the wrong
      * format for this type of ObjectID.
      */
-    public ObjectID stringWithoutProtocolToObject(String value) throws InvalidIDException {
+    @Override
+	public ObjectID stringWithoutProtocolToObject(String value) throws InvalidIDException {
         try {
 	        return new LongID( Long.parseLong(value) );
         } catch ( NumberFormatException e ) {
@@ -97,7 +100,8 @@ public ObjectID stringWithoutProtocolToObject(String value) throws InvalidIDExce
      * @throws InvalidIDException if the parser is aware of this protocol, but it is of the wrong
      * format for this type of ObjectID.
      */
-    public ObjectID stringToObject(String value) throws InvalidIDException {
+    @Override
+	public ObjectID stringToObject(String value) throws InvalidIDException {
         final ParsedObjectID parsedID = ParsedObjectID.parsedStringifiedObjectID(value,LongID.PROTOCOL);
         try {
             return new LongID( Long.parseLong(parsedID.getRemainder()) );
@@ -110,7 +114,8 @@ public ObjectID stringToObject(String value) throws InvalidIDException {
      * Return the name of the protocol that this factory uses.
      * @return the protocol name
      */
-    public String getProtocol() {
+    @Override
+	public String getProtocol() {
 	    return LongID.PROTOCOL;
     }
 }

plugins/org.teiid.core.designer/src/org/teiid/core/id/ObjectID.java

@@ -42,12 +42,14 @@ public interface ObjectID extends Comparable {
      * @throws ClassCastException if the specified object's type prevents it
      *      from being compared to this instance.
      */
-    int compareTo(Object obj);
+    @Override
+	int compareTo(Object obj);
     /**
      * Returns a string representing the current state of the object.
      * @return the string representation of this instance.
      */
-    String toString();
+    @Override
+	String toString();
     /**
      * Returns a string representing the current state of the object.
      * @param delim the delimiter that should be used

plugins/org.teiid.core.designer/src/org/teiid/core/id/StringID.java

@@ -42,7 +42,8 @@ protected StringID(long id) {
      * Get hash code for object
      * @return Hash code
      */
-    public int hashCode() {
+    @Override
+	public int hashCode() {
         return id.hashCode();
     }
 
@@ -54,7 +55,8 @@ public int hashCode() {
      * @param obj the object that this instance is to be compared to.
      * @return whether the object is equal to this object.
      */
-    public boolean equals(Object obj) {
+    @Override
+	public boolean equals(Object obj) {
         // Check if instances are identical ...
         if ( this == obj ) {
             return true;
@@ -85,7 +87,8 @@ public boolean equals(Object obj) {
      * @throws ClassCastException if the specified object's type prevents it
      *      from being compared to this instance.
      */
-    public int compareTo(Object obj) {
+    @Override
+	public int compareTo(Object obj) {
         StringID that = (StringID) obj;     // May throw ClassCastException
         Assertion.isNotNull(obj);
         return this.id.compareTo(that.id);
@@ -95,21 +98,24 @@ public int compareTo(Object obj) {
      * Returns a string representing the current state of the object.
      * @return the string representation of this instance.
      */
-    public String toString(){
+    @Override
+	public String toString(){
         return PROTOCOL + ObjectID.DELIMITER + this.id;
     }
     /**
      * @see org.teiid.core.id.ObjectID#toString(char)
      */
-    public String toString(char delim) {
+    @Override
+	public String toString(char delim) {
         return PROTOCOL + delim + this.id;
     }
 
     /**
      * Return the name of the protocol that this factory uses.
      * @return the protocol name
      */
-    public String getProtocol() {
+    @Override
+	public String getProtocol() {
 	    return PROTOCOL;
     }