Menu
▾
▴
[Andromda-cvs] SF.net SVN: andromda:[13250] trunk/andromda-core/src/main/java/org/andromda /core
|
From: <bob...@us...> - 2009-12-28 20:23:43
|
Revision: 13250
http://andromda.svn.sourceforge.net/andromda/?rev=13250&view=rev
Author: bobfields
Date: 2009-12-28 20:23:36 +0000 (Mon, 28 Dec 2009)
Log Message:
-----------
Initialize variable default values - avoid warnings.
Modified Paths:
--------------
trunk/andromda-core/src/main/java/org/andromda/core/cartridge/Cartridge.java
trunk/andromda-core/src/main/java/org/andromda/core/cartridge/Resource.java
trunk/andromda-core/src/main/java/org/andromda/core/cartridge/template/Template.java
trunk/andromda-core/src/main/java/org/andromda/core/common/AndroMDALogger.java
trunk/andromda-core/src/main/java/org/andromda/core/common/BasePlugin.java
trunk/andromda-core/src/main/java/org/andromda/core/common/ComponentContainer.java
trunk/andromda-core/src/main/java/org/andromda/core/common/ExceptionRecorder.java
trunk/andromda-core/src/main/java/org/andromda/core/common/Introspector.java
trunk/andromda-core/src/main/java/org/andromda/core/common/ResourceWriter.java
trunk/andromda-core/src/main/java/org/andromda/core/common/XmlObjectFactory.java
trunk/andromda-core/src/main/java/org/andromda/core/configuration/Configuration.java
trunk/andromda-core/src/main/java/org/andromda/core/configuration/Model.java
trunk/andromda-core/src/main/java/org/andromda/core/configuration/Namespaces.java
trunk/andromda-core/src/main/java/org/andromda/core/configuration/Property.java
trunk/andromda-core/src/main/java/org/andromda/core/engine/ModelProcessor.java
trunk/andromda-core/src/main/java/org/andromda/core/mapping/Mappings.java
trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeBase.java
trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeFactory.java
trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeImpls.java
trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeMapping.java
trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeMappings.java
trunk/andromda-core/src/main/java/org/andromda/core/metafacade/ModelValidationMessage.java
trunk/andromda-core/src/main/java/org/andromda/core/namespace/NamespaceRegistry.java
trunk/andromda-core/src/main/java/org/andromda/core/repository/Repositories.java
trunk/andromda-core/src/main/java/org/andromda/core/repository/Repository.java
trunk/andromda-core/src/main/java/org/andromda/core/server/DefaultServer.java
trunk/andromda-core/src/main/java/org/andromda/core/translation/library/Translation.java
Modified: trunk/andromda-core/src/main/java/org/andromda/core/cartridge/Cartridge.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/cartridge/Cartridge.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/cartridge/Cartridge.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -691,7 +691,7 @@
/**
* Indicates whether or not the global outputConditions have been evaluated.
*/
- private boolean conditionsEvaluated;
+ private boolean conditionsEvaluated = false;
/**
* Evaluates all conditions and stores the results in the <code>evaluatedConditions</code>
Modified: trunk/andromda-core/src/main/java/org/andromda/core/cartridge/Resource.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/cartridge/Resource.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/cartridge/Resource.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -120,7 +120,7 @@
/**
* Stores whether or not the resource should be overwritten.
*/
- private boolean overwrite;
+ private boolean overwrite = false;
/**
* Tells us whether output files produced by this resource should be overwritten if they already exist. Overwriting
Modified: trunk/andromda-core/src/main/java/org/andromda/core/cartridge/template/Template.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/cartridge/template/Template.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/cartridge/template/Template.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -32,7 +32,7 @@
* A flag indicating whether or not empty files should
* be generated.
*/
- private boolean generateEmptyFiles;
+ private boolean generateEmptyFiles = false;
/**
* Tells us whether output files should be generated if this template does not produce any output.
@@ -134,7 +134,7 @@
this.supportedModelElements = supportedModelElements;
}
- private boolean outputToSingleFile;
+ private boolean outputToSingleFile = false;
/**
* If output to single file is <code>true</code> then all model elements found by the processor (i.e. all those
@@ -198,5 +198,5 @@
/**
* The model elements (i.e. metafacades) supported by this template.
*/
- private ModelElements supportedModelElements;
+ private ModelElements supportedModelElements = null;
}
\ No newline at end of file
Modified: trunk/andromda-core/src/main/java/org/andromda/core/common/AndroMDALogger.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/common/AndroMDALogger.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/common/AndroMDALogger.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -69,7 +69,7 @@
/**
* The URI to an external logging configuration file.
*/
- private static String loggingConfigurationUri;
+ private static String loggingConfigurationUri = null;
/**
* Sets the URI to an external logging configuration file. This will override the default log4j.xml.
Modified: trunk/andromda-core/src/main/java/org/andromda/core/common/BasePlugin.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/common/BasePlugin.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/common/BasePlugin.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -129,7 +129,7 @@
/**
* The template engine that this plugin will use.
*/
- private TemplateEngine templateEngine;
+ private TemplateEngine templateEngine = null;
/**
* @see org.andromda.core.common.Plugin#getTemplateEngine()
@@ -227,7 +227,7 @@
/**
* Stores the contents of the plugin.
*/
- private List<String> contents;
+ private List<String> contents = null;
/**
* @see org.andromda.core.common.Plugin#getContents()
Modified: trunk/andromda-core/src/main/java/org/andromda/core/common/ComponentContainer.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/common/ComponentContainer.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/common/ComponentContainer.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -54,7 +54,7 @@
/**
* The shared instance.
*/
- private static ComponentContainer instance;
+ private static ComponentContainer instance = null;
/**
* Gets the shared instance of this ComponentContainer.
Modified: trunk/andromda-core/src/main/java/org/andromda/core/common/ExceptionRecorder.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/common/ExceptionRecorder.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/common/ExceptionRecorder.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -51,7 +51,7 @@
/**
* The exceptions directory, initialized to exceptions.
*/
- private static File exceptionDirectory;
+ private static File exceptionDirectory = null;
private static final SimpleDateFormat cvDateFormat = new SimpleDateFormat("yyMMddHHmmss");
private static final Random random = new Random();
@@ -186,11 +186,12 @@
*/
private static final String SUFFIX = ".exc";
- /**
- * Gets a unique file name.
- * @param prefix
- * @return uniqueName
- */
+ /**
+ * Gets a unique file name.
+ * @param prefix
+ * @return uniqueName
+ * @concurrency guarded
+ */
protected synchronized String getUniqueName(String prefix)
{
String uniqueName = prefix + cvDateFormat.format(new Date()) + SUFFIX;
Modified: trunk/andromda-core/src/main/java/org/andromda/core/common/Introspector.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/common/Introspector.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/common/Introspector.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -1,6 +1,6 @@
package org.andromda.core.common;
-import java.beans.IntrospectionException;
+import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;
import java.util.Collection;
@@ -21,7 +21,7 @@
/**
* The shared instance.
*/
- private static Introspector instance;
+ private static Introspector instance = null;
/**
* Gets the shared instance.
@@ -445,7 +445,7 @@
name.substring(dotIndex + 1));
}
}
- catch (final IntrospectionException exception)
+ catch (final IntrospectionException exception)
{
throw new IntrospectorException(exception);
}
@@ -542,7 +542,7 @@
{
if (object != null || (StringUtils.isNotEmpty(name)))
{
- Class expectedType;
+ Class expectedType = null;
if (value != null && object != null)
{
final PropertyDescriptor descriptor = this.getPropertyDescriptor(
@@ -591,4 +591,4 @@
this.evaluatingObjects.clear();
instance = null;
}
-}
+}
Modified: trunk/andromda-core/src/main/java/org/andromda/core/common/ResourceWriter.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/common/ResourceWriter.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/common/ResourceWriter.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -199,7 +199,7 @@
/**
* Stores the encoding to be used for output.
*/
- private String encoding;
+ private String encoding = null;
/**
* Sets the encoding to which all output written from this class will be
@@ -236,12 +236,12 @@
this.writtenCount = 0;
}
- private String modelFile;
+ private String modelFile = null;
/**
* Stores the count of the resources written over this instance's history.
*/
- private long writtenCount;
+ private long writtenCount = 0;
/**
* Gets the number of currently written resources over the course of this instance's history.
Modified: trunk/andromda-core/src/main/java/org/andromda/core/common/XmlObjectFactory.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/common/XmlObjectFactory.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/common/XmlObjectFactory.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -12,7 +12,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
+import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -66,22 +66,22 @@
/**
* The digester instance.
*/
- private Digester digester;
+ private Digester digester = null;
/**
* The class of which the object we're instantiating.
*/
- private Class objectClass;
+ private Class objectClass = null;
/**
* The URL to the object rules.
*/
- private URL objectRulesXml;
+ private URL objectRulesXml = null;
/**
* The URL of the schema.
*/
- private URL schemaUri;
+ private URL schemaUri = null;
/**
* Whether or not validation should be turned on by default when using this factory to load XML configuration
@@ -280,7 +280,7 @@
ExceptionUtils.checkNull(
"objectXml",
objectXml);
- Object object;
+ Object object = null;
try
{
this.digester.setEntityResolver(new XmlObjectEntityResolver(resource));
@@ -319,7 +319,7 @@
* Handles the validation errors.
*/
static final class XmlObjectValidator
- implements ErrorHandler
+ implements ErrorHandler
{
/**
* @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
@@ -461,4 +461,4 @@
return source;
}
}
-}
+}
Modified: trunk/andromda-core/src/main/java/org/andromda/core/configuration/Configuration.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/configuration/Configuration.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/configuration/Configuration.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -226,7 +226,7 @@
/**
* Stores the contents of the configuration as a string.
*/
- private String contents;
+ private String contents = null;
/**
* Gets the URI from which this instance was
Modified: trunk/andromda-core/src/main/java/org/andromda/core/configuration/Model.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/configuration/Model.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/configuration/Model.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -26,7 +26,7 @@
* Stores whether or not a last modified check
* should be performed.
*/
- private boolean lastModifiedCheck;
+ private boolean lastModifiedCheck = false;
/**
* Whether or not to perform a last modified check on the model.
@@ -134,7 +134,7 @@
* Caches the urisAsStrings value (so we don't need
* to do the conversion more than once).
*/
- private String[] urisAsStrings;
+ private String[] urisAsStrings = null;
/**
* All URIs that make up the model.
@@ -287,7 +287,7 @@
/**
* Stores the path for each module search location in this configuration.
*/
- private String[] moduleSearchLocationPaths;
+ private String[] moduleSearchLocationPaths = null;
/**
* Gets all found module search location paths for this model instance.
@@ -319,7 +319,7 @@
* Stores all resources including all resources found within the module search locations
* as well as a resource for the {@link #getUris()}.
*/
- private URL[] moduleSearchLocationResources;
+ private URL[] moduleSearchLocationResources = null;
/**
* Gets the accumulation of all files found when combining the contents
@@ -387,7 +387,7 @@
/**
* The unique key that identifies this model.
*/
- private String key;
+ private String key = null;
/**
* Creates the unique key that identifies this model
Modified: trunk/andromda-core/src/main/java/org/andromda/core/configuration/Namespaces.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/configuration/Namespaces.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/configuration/Namespaces.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -5,7 +5,6 @@
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
-
import org.andromda.core.common.ExceptionUtils;
import org.andromda.core.namespace.NamespaceComponent;
import org.andromda.core.namespace.NamespaceRegistry;
@@ -44,7 +43,7 @@
/**
* The shared instance.
*/
- private static Namespaces instance;
+ private static Namespaces instance = null;
/**
* Returns the singleton instance of this Namespaces
@@ -221,7 +220,7 @@
{
/*if (logger.isDebugEnabled())
{
- logger.debug("no namespace with name '" + namespaceName + "' found, looking for '" + Namespaces.DEFAULT + "'");
+ logger.debug("no namespace with name '" + namespaceName + "' found, looking for '" + Namespaces.DEFAULT + '\'');
}*/
defaultNamespace = this.namespaces.get(Namespaces.DEFAULT);
if (defaultNamespace != null)
Modified: trunk/andromda-core/src/main/java/org/andromda/core/configuration/Property.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/configuration/Property.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/configuration/Property.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -70,7 +70,7 @@
/**
* Stores whether or not this property should be ignored.
*/
- private boolean ignore;
+ private boolean ignore = false;
/**
* If a property is set to ignore then Namespaces will ignore it if it doesn't exist on lookup (otherwise errors
Modified: trunk/andromda-core/src/main/java/org/andromda/core/engine/ModelProcessor.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/engine/ModelProcessor.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/engine/ModelProcessor.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -472,7 +472,7 @@
/**
* The current configuration of this model processor.
*/
- private Configuration currentConfiguration;
+ private Configuration currentConfiguration = null;
/**
* Determines whether or not this model processor needs to be reconfigured.
@@ -601,12 +601,12 @@
/**
* Stores the cartridge filter.
*/
- private List cartridgeFilter;
+ private List cartridgeFilter = null;
/**
* Denotes whether or not the complement of filtered cartridges should be processed
*/
- private boolean negateCartridgeFilter;
+ private boolean negateCartridgeFilter = false;
/**
* Indicates whether or not the <code>namespace</code> should be processed. This is determined in conjunction with
Modified: trunk/andromda-core/src/main/java/org/andromda/core/mapping/Mappings.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/mapping/Mappings.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/mapping/Mappings.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -297,7 +297,7 @@
* Holds the name of this mapping. This corresponds usually to some language
* (i.e. Java, or a database such as Oracle, Sql Server, etc).
*/
- private String name;
+ private String name = null;
/**
* Returns the name name (this is the name for which the type mappings are
Modified: trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeBase.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeBase.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeBase.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -72,7 +72,7 @@
* Stores whether or not this metafacade has
* been initialized.
*/
- private boolean initialized;
+ private boolean initialized = false;
/**
* Sets the flag indicating this metafacade has been initialized.
@@ -183,7 +183,7 @@
/**
* Stores the context for this metafacade
*/
- private String context;
+ private String context = null;
/**
* Gets the context for this metafacade.
@@ -227,7 +227,7 @@
/**
* Stores the namespace for this metafacade
*/
- private String namespace;
+ private String namespace = null;
/**
* Gets the current namespace for this metafacade
@@ -320,7 +320,7 @@
/**
* The flag indicating whether or not this metafacade is a context root.
*/
- protected boolean contextRoot;
+ protected boolean contextRoot = false;
/**
* Sets whether or not this metafacade represents a contextRoot. If it does represent a context root, then {@link
@@ -353,7 +353,7 @@
/**
* Stores the name of the interface for this metafacade
*/
- private String name;
+ private String name = null;
/**
* Gets the name for this metafacade.
@@ -396,7 +396,7 @@
/**
* In order to speed up the check for this property (which will happen many times), we cache it :-)
*/
- private Boolean metafacadePropertyCachingEnabled;
+ private Boolean metafacadePropertyCachingEnabled = null;
/**
* A check to verify whether or not to make use of metafacade property caching. This method check if the {@link
@@ -418,7 +418,7 @@
/**
* The instance of this class as the appropriate metafacade instance.
*/
- private MetafacadeBase THIS;
+ private MetafacadeBase THIS = null;
/**
* The metafacade instance of <code>this</code>. This should be used when
@@ -453,6 +453,11 @@
{
return -1;
}
- return ((MetafacadeBase)object).getValidationName().compareTo(this.getValidationName());
+ MetafacadeBase metafacade = (MetafacadeBase)object;
+ if (metafacade.getValidationName()==null)
+ {
+ return -1;
+ }
+ return metafacade.getValidationName().compareTo(this.getValidationName());
}
}
\ No newline at end of file
Modified: trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeFactory.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeFactory.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeFactory.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -35,7 +35,7 @@
/**
* The shared instance of this factory.
*/
- private static MetafacadeFactory instance;
+ private static MetafacadeFactory instance = null;
private MetafacadeFactory()
{
Modified: trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeImpls.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeImpls.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeImpls.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -271,7 +271,7 @@
ExceptionUtils.checkEmpty(
"metafacadeImplClass",
metafacadeImplClass);
- Class metafacadeClass;
+ Class metafacadeClass = null;
try
{
final String metafacadeClassName = this.metafacadesByImpls.get(metafacadeImplClass);
@@ -302,7 +302,7 @@
ExceptionUtils.checkEmpty(
"metafacadeClass",
metafacadeClass);
- Class metafacadeImplementationClass;
+ Class metafacadeImplementationClass = null;
try
{
final String metafacadeImplementationClassName = this.implsByMetafacades.get(metafacadeClass);
Modified: trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeMapping.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeMapping.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeMapping.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -25,7 +25,7 @@
/**
* The meta facade for which this mapping applies.
*/
- private Class metafacadeClass;
+ private Class metafacadeClass = null;
/**
* Gets the metafacadeClass for this mapping.
@@ -58,7 +58,7 @@
* The name of the mapping class for which this mapping applies. The {@link #context},{@link #stereotypes}and this
* name make up the identifying key for this mapping.
*/
- private String mappingClassName;
+ private String mappingClassName = null;
/**
* Gets the name of the metaobject class used for this mapping.
@@ -99,7 +99,7 @@
/**
* Whether or not this mapping represents a <code>contextRoot</code>.
*/
- private boolean contextRoot;
+ private boolean contextRoot = false;
/**
* <p/>
@@ -193,7 +193,7 @@
/**
* Used to hold the properties that should apply to the mapping element.
*/
- private PropertyGroup mappingProperties;
+ private PropertyGroup mappingProperties = null;
/**
* Adds a mapping property. This are used to narrow the metafacade to which the mapping can apply. The properties
Modified: trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeMappings.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeMappings.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/metafacade/MetafacadeMappings.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -47,7 +47,7 @@
/**
* The default meta facade to use when there isn't a mapping found.
*/
- private Class defaultMetafacadeClass;
+ private Class defaultMetafacadeClass = null;
/**
* Constructs a new instance of this class.
Modified: trunk/andromda-core/src/main/java/org/andromda/core/metafacade/ModelValidationMessage.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/metafacade/ModelValidationMessage.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/metafacade/ModelValidationMessage.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -92,7 +92,7 @@
/**
* Stores the metafacade name which is only constructed the very first time.
*/
- private String metafacadeName;
+ private String metafacadeName = null;
/**
* Gets the name of the metafacade to which this validation message applies.
@@ -132,7 +132,7 @@
/**
* Stores the metafacade class displayed within the message, this is only retrieved the very first time.
*/
- private Class metafacadeClass;
+ private Class metafacadeClass = null;
/**
* Gets the class of the metafacade to which this validation message applies.
Modified: trunk/andromda-core/src/main/java/org/andromda/core/namespace/NamespaceRegistry.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/namespace/NamespaceRegistry.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/namespace/NamespaceRegistry.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -43,7 +43,7 @@
/**
* Whether or not this is a shared namespace.
*/
- private boolean shared;
+ private boolean shared = false;
/**
* Gets whether or not the namespace defined by this registry
Modified: trunk/andromda-core/src/main/java/org/andromda/core/repository/Repositories.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/repository/Repositories.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/repository/Repositories.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -1,6 +1,5 @@
package org.andromda.core.repository;
-import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
import java.util.LinkedHashMap;
@@ -169,7 +168,10 @@
model.getModuleSearchLocationPaths());
// - set the package filter
- repositoryImplementation.getModel().setPackageFilter(model.getPackages());
+ if (repositoryImplementation.getModel()!=null)
+ {
+ repositoryImplementation.getModel().setPackageFilter(model.getPackages());
+ }
for (InputStream stream : streams)
{
IOUtils.closeQuietly(stream);
Modified: trunk/andromda-core/src/main/java/org/andromda/core/repository/Repository.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/repository/Repository.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/repository/Repository.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -16,7 +16,7 @@
/**
* Stores the repository facade implementation.
*/
- private RepositoryFacade implementation;
+ private RepositoryFacade implementation = null;
/**
* Sets the implementation class name.
Modified: trunk/andromda-core/src/main/java/org/andromda/core/server/DefaultServer.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/server/DefaultServer.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/server/DefaultServer.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -33,7 +33,7 @@
/**
* The server listener.
*/
- private ServerSocket listener;
+ private ServerSocket listener = null;
/**
* The AndroMDA Engine instance.
@@ -177,4 +177,4 @@
// ignore exception
}
}
-}
+}
Modified: trunk/andromda-core/src/main/java/org/andromda/core/translation/library/Translation.java
===================================================================
--- trunk/andromda-core/src/main/java/org/andromda/core/translation/library/Translation.java 2009-12-28 20:22:09 UTC (rev 13249)
+++ trunk/andromda-core/src/main/java/org/andromda/core/translation/library/Translation.java 2009-12-28 20:23:36 UTC (rev 13250)
@@ -35,7 +35,7 @@
// should never happen, but it doesn't hurt to be safe
if (this.libraryTranslation == null)
{
- throw new LibraryException("Translation.getLibraryTranslation" + " - libraryTranslation can not be null");
+ throw new LibraryException("Translation.getLibraryTranslation - libraryTranslation can not be null");
}
return libraryTranslation;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|