Fix eclipse code style warnings

* Fixes the accessing of constants. Should be directly from the
  interface rather then implementing classes

* Fixes missing deprecation annotations
Fix eclipse warnings concerning NON-NLS comments

* Adds missing NON-NLS comments

* Removes unnecessary NON-NLS comments
Fix eclipse warnings in plugin build.properties

* src directory should not be included in source builds list of inclusions
  since it is included by default

* plugin.properties is not necessary to be included in source builds

* Projects that do not have src directories and build into named output
  directories (not bin) should not include the source or output fields
	in the build.properties files
Fix eclipse java related warnings

* Removes unnecessary imports

* Removes unnecessary casts
Fix eclipse warnings concerning redundant implementation of interfaces

* Class C does not need to directly implement interface A when it already
  implements interface B, which extends interface A
Fix eclipse override warnings

 * Overriding methods should be tagged with the @Override annotation and
   eclipse gives a warning if it is missing.
Merge branch 'master' into fix-eclipse-warnings

Conflicts:
	plugins/org.mockito/build.properties
	plugins/org.powermock/build.properties
	plugins/org.teiid.designer.core/src/org/teiid/designer/core/util/FlatRegistry.java
	plugins/org.teiid.designer.core/src/org/teiid/designer/core/workspace/ModelWorkspaceImpl.java
	plugins/org.teiid.designer.metamodels.relationship/build.properties
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/FileReference.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/RelationshipMetamodelPlugin.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/UriReference.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/aspects/relationship/RelationAspect.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/aspects/relationship/RelationRoleAspect.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/aspects/relationship/RelationTypeAspect.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/aspects/relationship/RelationshipAspectFactoryImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/aspects/validation/RelationshipValidationAspectFactoryImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/aspects/validation/rules/RelationshipEntityValidationRule.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/compare/AbstractRelationshipEntityMatcher.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/compare/RelationshipMatcher.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/compare/RelationshipMatcherFactory.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/FileReferenceImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/PlaceholderReferenceContainerImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/PlaceholderReferenceImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/RelationshipEntityImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/RelationshipFactoryImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/RelationshipFolderImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/RelationshipImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/RelationshipPackageImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/RelationshipRoleImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/RelationshipTypeImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/UriReferenceImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/provider/PlaceholderReferenceContainerItemProvider.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/provider/PlaceholderReferenceItemProvider.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/provider/RelationshipAssociationProvider.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/provider/RelationshipEntityItemProvider.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/provider/RelationshipItemProviderAdapterFactory.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/util/RelationshipEntityFinder.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/util/RelationshipFinder.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/util/RelationshipRoleFinder.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/util/RelationshipTypeFinder.java
	plugins/org.teiid.designer.metamodels.uml2/build.properties
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/Uml2Plugin.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/AbstractUml2DependencyUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/AbstractUml2ElementUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/AbstractUml2NamedElementUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/AbstractUml2UmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2AbstractionUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2AssociationUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2ClassUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2CommentUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2EnumerationLiteralUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2EnumerationUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2GeneralizationUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2InterfaceUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2OperationUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2PackageUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2PropertyUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2RealizationUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2SubstitutionUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2UmlAspectFactoryImpl.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2UsageUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/validation/Uml2ValidationAspectFactoryImpl.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/validation/rules/Uml2StringNameRule.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlElementImportMatcher.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlNamedElementCaseInsensitiveMatcher.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlNamedElementMatcher.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlObjectMatcherFactory.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlPackageImportMatcher.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlUnNamedAssociationMatcher.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlUnNamedClassifierMatcher.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlUnNamedGeneralizationMatcher.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlUnNamedPropertyMatcher.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlValueSpecificationMatcher.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/provider/Uml2AssociationProvider.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/provider/Uml2DependencyProvider.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/provider/Uml2GeneralizationProvider.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/proxy/UmlInvocationFactoryHelper.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/util/AssociationFinder.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/util/ClassFinder.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/util/DependencyFinder.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/util/Uml2ResourceLoadOptionContributor.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/util/UmlEntityFinder.java
	plugins/org.teiid.designer.metamodels.xmlservice/build.properties
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/XmlInput.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/XmlOutput.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/XmlServiceMetamodelPlugin.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/sql/XmlInputAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/sql/XmlOperationAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/sql/XmlOutputAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/sql/XmlResultAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/sql/XmlServiceComponentAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/sql/XmlServiceSqlAspectFactoryImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/uml/XmlInputAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/uml/XmlOperationAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/uml/XmlOutputAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/uml/XmlResultAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/uml/XmlServiceComponentAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/uml/XmlServiceUmlAspectFactoryImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/validation/XmlServiceValidationAspectFactoryImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/validation/rules/GlobalSchemaReferenceRule.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/validation/rules/MissingSchemaReferenceRule.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/impl/XmlInputImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/impl/XmlMessageImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/impl/XmlOperationImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/impl/XmlOutputImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/impl/XmlResultImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/impl/XmlServiceComponentImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/impl/XmlServiceFactoryImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/impl/XmlServicePackageImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/provider/XmlResultItemProvider.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/provider/XmlServiceComponentItemProvider.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/provider/XmlServiceItemProviderAdapterFactory.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/util/ReferencedXSDSchemaFinder.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/util/XmlInputFinder.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/util/XmlOperationFinder.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/util/XmlServiceComponentFinder.java
	plugins/org.teiid.designer.modelgenerator.uml2/build.properties
	plugins/org.teiid.designer.modelgenerator.uml2/src/org/teiid/designer/modelgenerator/uml2/processor/RelationalFragmentGeneratorImpl.java
	plugins/org.teiid.designer.modelgenerator.uml2/src/org/teiid/designer/modelgenerator/uml2/processor/Uml2RelationalGeneratorImpl.java
	plugins/org.teiid.designer.modelgenerator.uml2/src/org/teiid/designer/modelgenerator/uml2/processor/Uml2RelationalOptions.java
	plugins/org.teiid.designer.modelgenerator.uml2/src/org/teiid/designer/modelgenerator/uml2/processor/Uml2RelationalProcessor.java
	plugins/org.teiid.designer.modelgenerator.uml2/src/org/teiid/designer/modelgenerator/uml2/util/NullRelationalObjectNamingStrategy.java
	plugins/org.teiid.designer.modelgenerator.uml2/src/org/teiid/designer/modelgenerator/uml2/util/RelationalObjectGeneratorImpl.java
	plugins/org.teiid.designer.modelgenerator.uml2/src/org/teiid/designer/modelgenerator/uml2/util/RelationalObjectNamingStrategyImpl.java
	plugins/org.teiid.designer.modelgenerator.uml2/src/org/teiid/designer/modelgenerator/uml2/util/ValidatingRelationalObjectNameStrategy.java
	plugins/org.teiid.designer.relationship.ui/build.properties
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/RelationshipPerspectiveContributor.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/actions/RelationshipDiagramPermanentActionContributor.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/connection/RelationshipAnchorManager.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/custom/CustomDiagramContentProvider.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/custom/CustomDiagramHelper.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/custom/CustomDiagramLabelProvider.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/custom/CustomDiagramType.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/custom/actions/CustomDiagramPermanentActionContributor.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/diagram/RelationshipDiagramContentProvider.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/diagram/RelationshipDiagramLabelProvider.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/diagram/RelationshipDiagramProvider.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/diagram/RelationshipDiagramType.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/NewRelationshipTypeWizard.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/NewRelationshipWizard.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/RelationshipLocationSelectionValidator.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/RelationshipModelSelectorDialog.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/RelationshipObjectEditorPage.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/RelationshipPanel.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/RelationshipTypeObjectEditorPage.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/RelationshipTypePanel.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/RelationshipTypeSelectionValidator.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/RelationshipTypeWizardPage.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/RelationshipWizardPage.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/figure/RelationshipFolderFigure.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/figure/RelationshipNodeFigure.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/figure/RelationshipTypeFigure.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/model/RelationshipDiagramModelFactory.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/NavigationEditor.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/NavigationFocusComboBox.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/NavigationStatusBarUpdater.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/NavigationView.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/actions/BackDropDownAction.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/actions/EditWrapperAction.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/actions/ForwardDropDownAction.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/actions/NavigateToAction.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/actions/OpenInNavigatorAction.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/actions/OpenWrapperAction.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/actions/PropertiesAction.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/actions/RefreshAction.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/actions/SetFocusAction.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/figure/AbstractNavigationNodeFigure.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/model/AbstractNavigationModelNode.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/model/FreeNavigationModelNode.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/part/AbstractNavigationEditPart.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/part/LabelEditPart.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/part/NavigationDiagramPartFactory.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/part/NavigationEditPart.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/part/NavigationNodeEditPart.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/selection/NavigationSelectionHandler.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/part/FocusNodeEditPart.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/part/RelationshipDiagramPartFactory.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/part/RelationshipFolderEditPart.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/part/RelationshipNodeEditPart.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/part/RelationshipTypeNodeEditPart.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/properties/RelationshipPropertyEditorFactory.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/properties/RelationshipRoleAccumulatorSelectionValidator.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/properties/RelationshipRoleSelectionValidator.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/properties/RelationshipTypeSelectionValidator.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/search/RelationshipSearchPage.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/textimport/RelationshipTextImportModelSelectorDialog.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/textimport/RelationshipsLocationSelectionValidator.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/wizards/GenerateSqlRelationshipsMainPage.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/wizards/GenerateSqlRelationshipsWizard.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/wizards/ImportRelationshipsMainPage.java
	plugins/org.teiid.designer.relationship/build.properties
	plugins/org.teiid.designer.relationship/src/org/teiid/designer/relationship/NavigationContextBuilderImpl.java
	plugins/org.teiid.designer.relationship/src/org/teiid/designer/relationship/NavigationContextImpl.java
	plugins/org.teiid.designer.relationship/src/org/teiid/designer/relationship/NavigationHistoryImpl.java
	plugins/org.teiid.designer.relationship/src/org/teiid/designer/relationship/NavigationLinkImpl.java
	plugins/org.teiid.designer.relationship/src/org/teiid/designer/relationship/NavigationNodeImpl.java
	plugins/org.teiid.designer.relationship/src/org/teiid/designer/relationship/RelationshipEditorImpl.java
	plugins/org.teiid.designer.relationship/src/org/teiid/designer/relationship/RelationshipSearchImpl.java
	plugins/org.teiid.designer.relationship/src/org/teiid/designer/relationship/RelationshipTypeEditorImpl.java
	plugins/org.teiid.designer.ui.common/src/org/teiid/designer/ui/common/actions/AbstractActionService.java
	plugins/org.teiid.designer.webservice/src/org/teiid/designer/webservice/WebServiceXsdResource.java
	tests/org.teiid.designer.metamodels.relationship.test/build.properties
	tests/org.teiid.designer.metamodels.uml2.test/build.properties
	tests/org.teiid.designer.modelgenerator.uml2.test/build.properties
	tests/org.teiid.designer.modelgenerator.uml2.test/src/org/teiid/designer/modelgenerator/uml2/processor/TrivialRelationalFragmentGenerator.java
	tests/org.teiid.designer.modelgenerator.uml2.test/src/org/teiid/designer/modelgenerator/uml2/util/FakeDatatypeFinder.java
	tests/org.teiid.designer.modelgenerator.uml2.test/src/org/teiid/designer/modelgenerator/uml2/util/FakeEObjectUtil.java
	tests/org.teiid.designer.modelgenerator.uml2.test/src/org/teiid/designer/modelgenerator/uml2/util/FakeTreeSelection.java
	tests/org.teiid.designer.relationship.test/src/org/teiid/designer/relationship/FakeIndexSelectorFactory.java
	tests/org.teiid.designer.relationship.test/src/org/teiid/designer/relationship/FakeNavigationContextBuilder.java
	tests/org.teiid.designer.relationship.test/src/org/teiid/designer/relationship/FakeNavigationContextImpl.java
	tests/org.teiid.designer.test/build.properties
Merge branch 'fix-eclipse-warnings'
Ensure that tests always use mockito version 1.9 or better

* Possible that jenkins builds find mockito 1.8.4 is maven and decide to
  use it rather than 1.9.0 resulting in hamcrest plugin loading problems:

  ** previously initiated loading for a different type with name
     "org/hamcrest/Matcher"
TEIIDDES-1372: Eclipse formatting template saved

* Saved separately to scripts/eclipse directory

* The style of the formatting template has changed to using an xml
  syntax. As such, the original formmatting contained in the eclipse
	preferences is no longer applied.

* This stores the template separately and it can be imported into
  eclipse using the import button in the formatting preferences window.
TEIIDDES-1372: Updates Eclipse formatting template

* Wrapping of lines disabled

* Do not insert spaces between method parameters and their brackets
TEIIDDES-1372: Refactors Eclipse preference template

* Moves preference template to scripts/eclipse directory

* To better display differences and modifications the preference
  template is sorted into alphabetical order.

* Future commits of this template should also be sorted to ensure
  diffs clearly display changes.
TEIIDDES-1372: Updates Eclipse preference template

* Replace old formatting keys with new xml style

* Change some annoying compile errors to warnings
Merge branch 'reformat-codebase'