Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2013-10-21 15:22:06 -0400
committerChristian W. Damus2013-10-21 15:22:06 -0400
commit1e3c85bc9f9514eb98628b86e9e17ec63a9a9e74 (patch)
treea13953763b839179d17d507c92b116ca6fbdac80
parentf3be3bd834c62f2f8ce8944d1450e77767dbf6e5 (diff)
parent56f2473071fbb6e3eb2aebfb7eed66b3e09add08 (diff)
downloadcdo-1e3c85bc9f9514eb98628b86e9e17ec63a9a9e74.tar.gz
cdo-1e3c85bc9f9514eb98628b86e9e17ec63a9a9e74.tar.xz
cdo-1e3c85bc9f9514eb98628b86e9e17ec63a9a9e74.zip
Merge remote-tracking branch 'origin/master' into bugs/399306
Conflicts: plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.java plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/ISessionProtocol.java plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/DelegatingSessionProtocol.java
-rw-r--r--features/org.eclipse.emf.cdo.releng.apireports-feature/feature.properties2
-rw-r--r--features/org.eclipse.emf.cdo.releng.buildstamp-feature/feature.properties2
-rw-r--r--features/org.eclipse.emf.cdo.releng.buildstamp-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.releng.gitbash-feature/feature.properties2
-rw-r--r--features/org.eclipse.emf.cdo.releng.help-feature/feature.properties2
-rw-r--r--features/org.eclipse.emf.cdo.releng.help-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.releng.launches-feature/feature.properties2
-rw-r--r--features/org.eclipse.emf.cdo.releng.manifests-feature/feature.properties2
-rw-r--r--features/org.eclipse.emf.cdo.releng.preferences-feature/.project27
-rw-r--r--features/org.eclipse.emf.cdo.releng.preferences-feature/build.properties13
-rw-r--r--features/org.eclipse.emf.cdo.releng.preferences-feature/feature.properties8
-rw-r--r--features/org.eclipse.emf.cdo.releng.preferences-feature/feature.xml66
-rw-r--r--features/org.eclipse.emf.cdo.releng.projectconfig-feature/.project27
-rw-r--r--features/org.eclipse.emf.cdo.releng.projectconfig-feature/build.properties13
-rw-r--r--features/org.eclipse.emf.cdo.releng.projectconfig-feature/feature.properties9
-rw-r--r--features/org.eclipse.emf.cdo.releng.projectconfig-feature/feature.xml80
-rw-r--r--features/org.eclipse.emf.cdo.releng.projectcopy-feature/feature.properties2
-rw-r--r--features/org.eclipse.emf.cdo.releng.relativepaths-feature/feature.properties2
-rw-r--r--features/org.eclipse.emf.cdo.releng.relativepaths-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.releng.setup.editor-feature/feature.xml7
-rw-r--r--features/org.eclipse.emf.cdo.releng.tasks-feature/feature.properties2
-rw-r--r--features/org.eclipse.emf.cdo.releng.tasks-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.releng.version-feature/feature.xml9
-rw-r--r--features/org.eclipse.emf.cdo.releng.version.sdk-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.releng.windowtitle-feature/feature.properties2
-rw-r--r--features/org.eclipse.emf.cdo.releng.windowtitle-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.releng.winexplorer-feature/feature.properties2
-rw-r--r--features/org.eclipse.emf.cdo.releng.winexplorer-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.releng.workingsets-feature/feature.properties4
-rw-r--r--features/org.eclipse.emf.cdo.releng.workingsets-feature/feature.xml7
-rw-r--r--features/org.eclipse.emf.cdo.site-feature/category.xml6
-rw-r--r--features/org.eclipse.emf.cdo.site-feature/feature.xml247
-rw-r--r--features/org.eclipse.net4j.db.h2-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.db.oracle-feature/feature.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOType.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocol.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/security/CDOPermission.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryQueue.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/NOOPRevisionCache.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractQueryResult.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/src/org/gastro/internal/server/OM.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/DemoConfiguration.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/Server.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitNotificationIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadPermissionsRequest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryRequest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.apireports/about.properties4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.apireports/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.buildstamp/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.buildstamp/about.properties4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.buildstamp/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.gitbash/about.properties4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.gitbash/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.help/META-INF/MANIFEST.MF28
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.help/about.properties4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.help/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.launches/about.properties4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.launches/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.manifests/about.properties4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.manifests/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.manifests/plugin.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates.edit/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates.edit/build.properties15
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates.edit/copyright.txt8
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates.edit/plugin.properties13
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates.edit/plugin.xml11
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/AndPredicateItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/BuilderPredicateItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/FilePredicateItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/NamePredicateItemProvider.java35
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/NaturePredicateItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/NotPredicateItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/OrPredicateItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/PredicatesEditPlugin.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/PredicatesItemProviderAdapterFactory.java70
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/RepositoryPredicateItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/about.ini15
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/about.mappings6
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/about.properties31
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/build.properties6
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/modeling32.pngbin2414 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/plugin.properties4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/plugin.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/AndPredicate.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/BuilderPredicate.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/FilePredicate.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/NamePredicate.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/NaturePredicate.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/NotPredicate.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/OrPredicate.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/Predicate.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/PredicatesFactory.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/PredicatesPackage.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/RepositoryPredicate.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/AndPredicateImpl.java43
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/BuilderPredicateImpl.java44
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/FilePredicateImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/NamePredicateImpl.java44
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/NaturePredicateImpl.java44
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/NotPredicateImpl.java70
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/OrPredicateImpl.java40
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/PredicatesFactoryImpl.java61
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/PredicatesPackageImpl.java130
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/RepositoryPredicateImpl.java44
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/util/PredicatesAdapterFactory.java140
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/util/PredicatesSwitch.java184
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.edit/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.edit/build.properties15
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.edit/copyright.txt8
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.edit/plugin.properties13
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.edit/plugin.xml11
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PreferenceNodeItemProvider.java79
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PreferencesEditPlugin.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PreferencesItemProviderAdapterFactory.java26
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PropertyItemProvider.java56
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.editor/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.editor/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.editor/build.properties15
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.editor/copyright.txt8
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.editor/plugin.properties13
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.editor/plugin.xml11
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/action/OpenEditorAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/action/ShowInExplorerAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/AllPreferencesPreferencePage.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesActionBarContributor.java112
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesEditor.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesEditorPlugin.java25
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesModelWizard.java223
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences/about.properties14
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences/build.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences/plugin.properties4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences/plugin.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/PreferenceNode.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/PreferencesFactory.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/PreferencesPackage.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/Property.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PreferenceNodeImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PreferencesFactoryImpl.java40
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PreferencesPackageImpl.java66
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PropertyImpl.java107
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/util/PreferencesAdapterFactory.java56
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/util/PreferencesSwitch.java50
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/build.properties15
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/copyright.txt8
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/plugin.properties13
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/plugin.xml11
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/PreferenceFilterItemProvider.java52
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/PreferenceProfileItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/ProjectConfigEditPlugin.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/ProjectConfigItemProviderAdapterFactory.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/ProjectItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/WorkspaceConfigurationItemProvider.java86
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/build.properties15
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/copyright.txt8
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/plugin.properties13
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/plugin.xml11
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigActionBarContributor.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigEditor.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigEditorPlugin.java27
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigPreferencePage.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/handlers/ApplyPreferenceProfilesHandler.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/handlers/NavigateHandler.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/about.properties14
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/build.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/plugin.properties4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/plugin.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/PreferenceFilter.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/PreferenceProfile.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/Project.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/ProjectConfigFactory.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/ProjectConfigPackage.java29
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/WorkspaceConfiguration.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/PreferenceFilterImpl.java153
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/PreferenceProfileImpl.java214
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectConfigFactoryImpl.java47
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectConfigPackageImpl.java164
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectConfigPlugin.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectImpl.java159
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/WorkspaceConfigurationImpl.java117
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/util/ProjectConfigAdapterFactory.java80
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/util/ProjectConfigSwitch.java82
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/util/ProjectConfigValidator.java69
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectcopy/about.properties4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectcopy/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.projectcopy/plugin.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.relativepaths/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.relativepaths/about.properties4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.relativepaths/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.relativepaths/plugin.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.release/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ApiBaselineTaskItemProvider.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/BuckminsterImportTaskItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/CompoundSetupTaskItemProvider.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ConfigurableItemItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipseIniTaskItemProvider.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipsePreferenceTaskItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipseVersionItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/GitCloneTaskItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/LinkLocationTaskItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/OneTimeSetupTaskItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/P2TaskItemProvider.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ResourceCopyTaskItemProvider.java17
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupTaskContainerItemProvider.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupTaskItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/StringVariableTaskItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/TextModificationItemProvider.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/TextModifyTaskItemProvider.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/WorkingSetTaskItemProvider.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/build.properties15
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/copyright.txt8
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/plugin.properties13
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/plugin.xml11
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupActionBarContributor.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditor.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditorAdvisor.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditorPlugin.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupModelWizard.java66
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/SetupEditorPlugin.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/actions/ManualPerformAction.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.product/Setup Dialog.launch2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.product/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/SetupDialog.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/Setup IDE.launch8
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/model/Configuration.setup10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/SetupTaskPerformer.java275
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/ui/ProgressLogDialog.java163
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/ApiBaselineTask.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/BuckminsterImportTask.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/CompoundSetupTask.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/ConfigurableItem.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/EclipseIniTask.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/EclipsePreferenceTask.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/GitCloneTask.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/LinkLocationTask.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/OneTimeSetupTask.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/P2Task.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/ResourceCopyTask.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupTask.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupTaskContainer.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupTaskScope.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/StringVariableTask.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/TextModification.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/TextModifyTask.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/Trigger.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/WorkingSetTask.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ApiBaselineTaskImpl.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BuckminsterImportTaskImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/CompoundSetupTaskImpl.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ConfigurableItemImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipseIniTaskImpl.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipsePreferenceTaskImpl.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/GitCloneTaskImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/LinkLocationTaskImpl.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/OneTimeSetupTaskImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/P2TaskImpl.java27
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ResourceCopyTaskImpl.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupFactoryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupTaskContainerImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupTaskImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/StringVariableTaskImpl.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TextModificationImpl.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TextModifyTaskImpl.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/WorkingSetTaskImpl.java47
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/SetupAdapterFactory.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/SetupSwitch.java106
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/log/ProgressLog.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.tasks/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.tasks/about.properties4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.tasks/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.tasks/plugin.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.ui/build.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.ui/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.ui/plugin.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.ui/src/org/eclipse/emf/cdo/releng/ui/Activator.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.ui/src/org/eclipse/emf/cdo/releng/ui/preferences/RelengPreferencePage.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.version.ui/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.version.ui/plugin.xml1
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.windowtitle/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.windowtitle/about.properties4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.windowtitle/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.winexplorer/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.winexplorer/about.properties4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.winexplorer/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.workingsets.edit/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.workingsets.edit/src/org/eclipse/emf/cdo/releng/workingsets/provider/WorkingSetItemProvider.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.workingsets.edit/src/org/eclipse/emf/cdo/releng/workingsets/provider/WorkingSetsEditPlugin.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.workingsets.editor/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.workingsets.editor/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.workingsets.editor/src/org/eclipse/emf/cdo/releng/workingsets/presentation/WorkingSetsEditor.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.workingsets.editor/src/org/eclipse/emf/cdo/releng/workingsets/presentation/WorkingSetsEditorPlugin.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.workingsets/about.properties4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.workingsets/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSet.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsFactoryImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsPackageImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsAdapterFactory.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsSwitch.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Directory.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Group.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Role.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/User.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/DerivedList.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/GroupImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/UserImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitNotificationRequest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadPermissionsIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryManager.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSession.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/AllTestsDBDB2NonAudit.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/DBOfflineConfig.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MEMStoreQueryTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_419574_Test.java82
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_419962_Test.java184
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestSessionManager.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractViewAction.java (renamed from plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ViewAction.java)4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CommitTransactionAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/DisableViewDurabilityAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EnableViewDurabilityAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/LoadResourceAction.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/MergeConflictsAction.java65
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewResourceNodeAction.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewEditorAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/SwitchTargetAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java8
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/SessionUtil.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.java145
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/FSMUtil.java28
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBConnectionProvider2.java2
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataInputExtender.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataOutputExtender.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInput.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInputStream.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutput.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutputStream.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/PasswordCredentials.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteException.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionIndication.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionRequest.java2
-rw-r--r--plugins/org.gastro.server/src/org/gastro/internal/server/OM.java2
369 files changed, 4842 insertions, 2072 deletions
diff --git a/features/org.eclipse.emf.cdo.releng.apireports-feature/feature.properties b/features/org.eclipse.emf.cdo.releng.apireports-feature/feature.properties
index 6cf5b606da..685be00cad 100644
--- a/features/org.eclipse.emf.cdo.releng.apireports-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.releng.apireports-feature/feature.properties
@@ -4,5 +4,5 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-featureName = CDO Release Engineering API Reports
+featureName = API Reports
description = Contains a Buckminster actor that produces API evolution reports by comparing the workspace API to an API baseline.
diff --git a/features/org.eclipse.emf.cdo.releng.buildstamp-feature/feature.properties b/features/org.eclipse.emf.cdo.releng.buildstamp-feature/feature.properties
index 3e6b9a0a63..fe5e519115 100644
--- a/features/org.eclipse.emf.cdo.releng.buildstamp-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.releng.buildstamp-feature/feature.properties
@@ -4,5 +4,5 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-featureName = CDO Release Engineering Build Stamp
+featureName = Build Stamp
description = Contains a build listener that writes the timestamp of successful builds to a file (can be used with Hudson CI).
diff --git a/features/org.eclipse.emf.cdo.releng.buildstamp-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.buildstamp-feature/feature.xml
index 5732f1fc94..80c2618541 100644
--- a/features/org.eclipse.emf.cdo.releng.buildstamp-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.buildstamp-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.releng.buildstamp"
label="%featureName"
- version="1.1.0.qualifier"
+ version="1.1.100.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.releng.gitbash-feature/feature.properties b/features/org.eclipse.emf.cdo.releng.gitbash-feature/feature.properties
index 08c7c0badf..97efc07b25 100644
--- a/features/org.eclipse.emf.cdo.releng.gitbash-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.releng.gitbash-feature/feature.properties
@@ -4,5 +4,5 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-featureName = CDO Release Engineering Git Bash
+featureName = Git Bash
description = Contains a popup action that starts a Git bash and some other actions on the selected Git repository.
diff --git a/features/org.eclipse.emf.cdo.releng.help-feature/feature.properties b/features/org.eclipse.emf.cdo.releng.help-feature/feature.properties
index 9e019e8cc3..f93c00f6a9 100644
--- a/features/org.eclipse.emf.cdo.releng.help-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.releng.help-feature/feature.properties
@@ -4,5 +4,5 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-featureName = CDO Release Engineering Documentation
+featureName = Documentation
description = Contains the documentation of the CDO release engineering infrastructure.
diff --git a/features/org.eclipse.emf.cdo.releng.help-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.help-feature/feature.xml
index 1149db90d3..498b2195af 100644
--- a/features/org.eclipse.emf.cdo.releng.help-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.help-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.releng.help"
label="%featureName"
- version="4.2.0.qualifier"
+ version="4.2.100.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.releng.launches-feature/feature.properties b/features/org.eclipse.emf.cdo.releng.launches-feature/feature.properties
index 14c019c061..2e116fbebf 100644
--- a/features/org.eclipse.emf.cdo.releng.launches-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.releng.launches-feature/feature.properties
@@ -4,5 +4,5 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-featureName = CDO Release Engineering Launch Decorator
+featureName = Launch Decorator
description = Contains a label decorator that highlights unshared launch configurations to ease their removal.
diff --git a/features/org.eclipse.emf.cdo.releng.manifests-feature/feature.properties b/features/org.eclipse.emf.cdo.releng.manifests-feature/feature.properties
index 0c2b171522..35c7a475ff 100644
--- a/features/org.eclipse.emf.cdo.releng.manifests-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.releng.manifests-feature/feature.properties
@@ -4,5 +4,5 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-featureName = CDO Release Engineering Manifest Opener
+featureName = Manifest Opener
description = Contains context-sensitive openers for plugin manifests (F6) and project properties (Shift+F6).
diff --git a/features/org.eclipse.emf.cdo.releng.preferences-feature/.project b/features/org.eclipse.emf.cdo.releng.preferences-feature/.project
new file mode 100644
index 0000000000..1d938de112
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.releng.preferences-feature/.project
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.cdo.releng.preferences-feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.emf.cdo.releng.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature>
+ </natures>
+</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.releng.preferences-feature/build.properties b/features/org.eclipse.emf.cdo.releng.preferences-feature/build.properties
new file mode 100644
index 0000000000..08e412d41e
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.releng.preferences-feature/build.properties
@@ -0,0 +1,13 @@
+# Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Eike Stepper - initial API and implementation
+
+# NLS_MESSAGEFORMAT_VAR
+
+bin.includes = feature.xml,\
+ feature.properties
diff --git a/features/org.eclipse.emf.cdo.releng.preferences-feature/feature.properties b/features/org.eclipse.emf.cdo.releng.preferences-feature/feature.properties
new file mode 100644
index 0000000000..335b08534a
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.releng.preferences-feature/feature.properties
@@ -0,0 +1,8 @@
+# Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+
+featureName = Preferences Management
+description = Utilities for managing preferences. \ No newline at end of file
diff --git a/features/org.eclipse.emf.cdo.releng.preferences-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.preferences-feature/feature.xml
new file mode 100644
index 0000000000..b37d107371
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.releng.preferences-feature/feature.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2011-2013 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<feature
+ id="org.eclipse.emf.cdo.releng.preferences"
+ label="%featureName"
+ version="1.0.0.qualifier"
+ provider-name="%providerName"
+ image="eclipse_update_120.jpg"
+ license-feature="org.eclipse.emf.cdo.license"
+ license-feature-version="0.0.0">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <url>
+ <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+ <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+ </url>
+
+ <plugin
+ id="org.eclipse.emf.cdo.releng.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.releng.preferences"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.releng.preferences.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.releng.preferences.editor"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.emf.cdo.releng.projectconfig-feature/.project b/features/org.eclipse.emf.cdo.releng.projectconfig-feature/.project
new file mode 100644
index 0000000000..70f28c8d35
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.releng.projectconfig-feature/.project
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.cdo.releng.projectconfig-feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.emf.cdo.releng.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature>
+ </natures>
+</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.releng.projectconfig-feature/build.properties b/features/org.eclipse.emf.cdo.releng.projectconfig-feature/build.properties
new file mode 100644
index 0000000000..08e412d41e
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.releng.projectconfig-feature/build.properties
@@ -0,0 +1,13 @@
+# Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Eike Stepper - initial API and implementation
+
+# NLS_MESSAGEFORMAT_VAR
+
+bin.includes = feature.xml,\
+ feature.properties
diff --git a/features/org.eclipse.emf.cdo.releng.projectconfig-feature/feature.properties b/features/org.eclipse.emf.cdo.releng.projectconfig-feature/feature.properties
new file mode 100644
index 0000000000..61b0c13ec2
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.releng.projectconfig-feature/feature.properties
@@ -0,0 +1,9 @@
+# Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+
+featureName = Project Configuration
+description = Contains a set of templates for things such as preferences that are automatically propagated to the appropriate target projects.
+
diff --git a/features/org.eclipse.emf.cdo.releng.projectconfig-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.projectconfig-feature/feature.xml
new file mode 100644
index 0000000000..9be8cb23a8
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.releng.projectconfig-feature/feature.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2011-2013 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
+-->
+<feature
+ id="org.eclipse.emf.cdo.releng.projectconfig"
+ label="%featureName"
+ version="1.0.0.qualifier"
+ provider-name="%providerName"
+ image="eclipse_update_120.jpg"
+ license-feature="org.eclipse.emf.cdo.license"
+ license-feature-version="0.0.0">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <url>
+ <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+ <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+ </url>
+
+ <plugin
+ id="org.eclipse.emf.cdo.releng.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.releng.projectconfig"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.releng.projectconfig.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.releng.projectconfig.editor"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.releng.predicates"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.releng.predicates.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.emf.cdo.releng.projectcopy-feature/feature.properties b/features/org.eclipse.emf.cdo.releng.projectcopy-feature/feature.properties
index 46aeae267d..2b531f6cde 100644
--- a/features/org.eclipse.emf.cdo.releng.projectcopy-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.releng.projectcopy-feature/feature.properties
@@ -4,5 +4,5 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-featureName = CDO Release Engineering Project Copy
+featureName = Project Copy
description = Contains a popup action that copies projects and adjusts their fundamental artifacts.
diff --git a/features/org.eclipse.emf.cdo.releng.relativepaths-feature/feature.properties b/features/org.eclipse.emf.cdo.releng.relativepaths-feature/feature.properties
index 771a2fc9eb..0f11a0a2f9 100644
--- a/features/org.eclipse.emf.cdo.releng.relativepaths-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.releng.relativepaths-feature/feature.properties
@@ -4,5 +4,5 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-featureName = CDO Release Engineering Relative Paths
+featureName = Relative Paths
description = Contains a popup action that copies the relative path between two workspace resources into the clipboard.
diff --git a/features/org.eclipse.emf.cdo.releng.relativepaths-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.relativepaths-feature/feature.xml
index 9e9a9c342b..140cd98267 100644
--- a/features/org.eclipse.emf.cdo.releng.relativepaths-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.relativepaths-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.releng.relativepaths"
label="%featureName"
- version="1.1.0.qualifier"
+ version="1.1.100.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.releng.setup.editor-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.setup.editor-feature/feature.xml
index f04b9895da..fb4e6e26b3 100644
--- a/features/org.eclipse.emf.cdo.releng.setup.editor-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.setup.editor-feature/feature.xml
@@ -53,4 +53,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.emf.cdo.releng.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/features/org.eclipse.emf.cdo.releng.tasks-feature/feature.properties b/features/org.eclipse.emf.cdo.releng.tasks-feature/feature.properties
index 7c090b7702..1dd99f892a 100644
--- a/features/org.eclipse.emf.cdo.releng.tasks-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.releng.tasks-feature/feature.properties
@@ -4,5 +4,5 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-featureName = CDO Release Engineering Tasks
+featureName = Tasks
description = Contains a decorator that appends the name of the assignee to a task label.
diff --git a/features/org.eclipse.emf.cdo.releng.tasks-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.tasks-feature/feature.xml
index f40cac9d9b..a613614cb0 100644
--- a/features/org.eclipse.emf.cdo.releng.tasks-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.tasks-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.releng.tasks"
label="%featureName"
- version="1.1.0.qualifier"
+ version="1.1.100.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.releng.version-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.version-feature/feature.xml
index 861a1464d3..b506b97077 100644
--- a/features/org.eclipse.emf.cdo.releng.version-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.version-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.releng.version"
label="%featureName"
- version="1.1.100.qualifier"
+ version="1.2.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
@@ -56,4 +56,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.emf.cdo.releng.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/features/org.eclipse.emf.cdo.releng.version.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.version.sdk-feature/feature.xml
index e0c6e0308a..164b1dd52b 100644
--- a/features/org.eclipse.emf.cdo.releng.version.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.version.sdk-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.releng.version.sdk"
label="%featureName"
- version="1.1.100.qualifier"
+ version="1.2.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.releng.windowtitle-feature/feature.properties b/features/org.eclipse.emf.cdo.releng.windowtitle-feature/feature.properties
index 07581bb3f5..a1929a0050 100644
--- a/features/org.eclipse.emf.cdo.releng.windowtitle-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.releng.windowtitle-feature/feature.properties
@@ -4,5 +4,5 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-featureName = CDO Release Engineering Window Title Setter
+featureName = Window Title Setter
description = Contains a plugin that sets the IDE window title to the name of the workspace location directory.
diff --git a/features/org.eclipse.emf.cdo.releng.windowtitle-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.windowtitle-feature/feature.xml
index 56a99c6e16..b29791a510 100644
--- a/features/org.eclipse.emf.cdo.releng.windowtitle-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.windowtitle-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.releng.windowtitle"
label="%featureName"
- version="1.1.0.qualifier"
+ version="1.1.100.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.releng.winexplorer-feature/feature.properties b/features/org.eclipse.emf.cdo.releng.winexplorer-feature/feature.properties
index 3d2138eea2..ba4f1362cb 100644
--- a/features/org.eclipse.emf.cdo.releng.winexplorer-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.releng.winexplorer-feature/feature.properties
@@ -4,5 +4,5 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-featureName = CDO Release Engineering Windows Explorer
+featureName = Windows Explorer
description = Contains a popup action that starts the Windows Explorer on the selected workspace resource.
diff --git a/features/org.eclipse.emf.cdo.releng.winexplorer-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.winexplorer-feature/feature.xml
index f2a608f3a7..39976c76e5 100644
--- a/features/org.eclipse.emf.cdo.releng.winexplorer-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.winexplorer-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.releng.winexplorer"
label="%featureName"
- version="1.1.0.qualifier"
+ version="1.1.100.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.releng.workingsets-feature/feature.properties b/features/org.eclipse.emf.cdo.releng.workingsets-feature/feature.properties
index 0d33f94582..d81ade8bba 100644
--- a/features/org.eclipse.emf.cdo.releng.workingsets-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.releng.workingsets-feature/feature.properties
@@ -4,5 +4,5 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-featureName = CDO Release Engineering Dynamic Working Sets
-description = Contains a set of CDO-specific working sets that are automatically populated with the appropriate workspace projects.
+featureName = Dynamic Working Sets
+description = Contains a set of working set descriptions that are automatically populated as Java working sets with the appropriate workspace projects.
diff --git a/features/org.eclipse.emf.cdo.releng.workingsets-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.workingsets-feature/feature.xml
index 8fb33fd88f..43380367e0 100644
--- a/features/org.eclipse.emf.cdo.releng.workingsets-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.workingsets-feature/feature.xml
@@ -70,4 +70,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.emf.cdo.releng.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/features/org.eclipse.emf.cdo.site-feature/category.xml b/features/org.eclipse.emf.cdo.site-feature/category.xml
index 49226abe5b..f5cc7c4072 100644
--- a/features/org.eclipse.emf.cdo.site-feature/category.xml
+++ b/features/org.eclipse.emf.cdo.site-feature/category.xml
@@ -144,6 +144,12 @@
<feature id="org.eclipse.emf.cdo.releng.setup.editor" version="0.0.0">
<category name="org.eclipse.emf.releng.category"/>
</feature>
+ <feature id="org.eclipse.emf.cdo.releng.projectconfig" version="0.0.0">
+ <category name="org.eclipse.emf.releng.category"/>
+ </feature>
+ <feature id="org.eclipse.emf.cdo.releng.preferences" version="0.0.0">
+ <category name="org.eclipse.emf.releng.category"/>
+ </feature>
<feature id="org.eclipse.emf.cdo.releng.manifests" version="0.0.0">
<category name="org.eclipse.emf.releng.category"/>
</feature>
diff --git a/features/org.eclipse.emf.cdo.site-feature/feature.xml b/features/org.eclipse.emf.cdo.site-feature/feature.xml
index aa42882e84..7acfc2a46d 100644
--- a/features/org.eclipse.emf.cdo.site-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.site-feature/feature.xml
@@ -30,54 +30,205 @@
%license
</license>
- <includes id="org.eclipse.emf.cdo.compare" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.dawn.codegen.gmf" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.dawn.sdk" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.dawn.tests" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.epp" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.examples" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.examples.hibernate" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.explorer.product" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.apireports" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.buildstamp" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.gitbash" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.help" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.launches" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.manifests" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.projectcopy" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.relativepaths" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.setup.editor" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.setup" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.setup.product" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.tasks" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.version" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.version.doc" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.version.headless" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.version.sdk" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.version.tests" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.windowtitle" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.winexplorer" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.releng.workingsets" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.sdk" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.server" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.server.db4o" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.server.hibernate" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.server.lissome" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.server.mongodb" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.server.objectivity" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.server.product" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.tests" version="0.0.0"/>
- <includes id="org.eclipse.emf.cdo.tests.hibernate" version="0.0.0"/>
- <includes id="org.eclipse.net4j.db.derby" version="0.0.0"/>
- <includes id="org.eclipse.net4j.db.h2" version="0.0.0"/>
- <includes id="org.eclipse.net4j.db.hsqldb" version="0.0.0"/>
- <includes id="org.eclipse.net4j.db.mysql" version="0.0.0"/>
- <includes id="org.eclipse.net4j.db.oracle" version="0.0.0"/>
- <includes id="org.eclipse.net4j.db.postgresql" version="0.0.0"/>
- <includes id="org.eclipse.net4j.examples" version="0.0.0"/>
- <includes id="org.eclipse.net4j.sdk" version="0.0.0"/>
- <includes id="org.eclipse.net4j.tests" version="0.0.0"/>
- <includes id="org.gastro" version="0.0.0"/>
+ <includes
+ id="org.eclipse.emf.cdo.compare"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.dawn.codegen.gmf"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.dawn.sdk"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.dawn.tests"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.epp"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.examples"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.examples.hibernate"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.explorer.product"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.apireports"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.buildstamp"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.gitbash"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.help"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.launches"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.manifests"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.projectcopy"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.relativepaths"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.setup.editor"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.setup"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.setup.product"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.tasks"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.version"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.version.doc"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.version.headless"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.version.sdk"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.version.tests"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.windowtitle"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.winexplorer"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.workingsets"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.sdk"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.server"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.server.db4o"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.server.hibernate"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.server.lissome"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.server.mongodb"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.server.objectivity"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.server.product"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.tests"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.tests.hibernate"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.net4j.db.derby"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.net4j.db.h2"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.net4j.db.hsqldb"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.net4j.db.mysql"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.net4j.db.oracle"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.net4j.db.postgresql"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.net4j.examples"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.net4j.sdk"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.net4j.tests"
+ version="0.0.0"/>
+
+ <includes
+ id="org.gastro"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.projectconfig"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.preferences"
+ version="0.0.0"/>
<plugin
id="org.eclipse.emf.cdo.tests.objectivity"
diff --git a/features/org.eclipse.net4j.db.h2-feature/feature.xml b/features/org.eclipse.net4j.db.h2-feature/feature.xml
index 2813abf1c4..535937c508 100644
--- a/features/org.eclipse.net4j.db.h2-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.h2-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2009-2012 Eike Stepper (Berlin, Germany) and others.
+ Copyright (c) 2009-2013 Eike Stepper (Berlin, Germany) and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
diff --git a/features/org.eclipse.net4j.db.oracle-feature/feature.xml b/features/org.eclipse.net4j.db.oracle-feature/feature.xml
index 6899def05b..ff0fa11491 100644
--- a/features/org.eclipse.net4j.db.oracle-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.oracle-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012 Eike Stepper (Berlin, Germany) and others.
+ Copyright (c) 2012, 2013 Eike Stepper (Berlin, Germany) and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOType.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOType.java
index 39af51956a..6829aefa4a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOType.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2008-2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocol.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocol.java
index 78e1cb8dd6..9651a1a80a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocol.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2009, 2011-2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/security/CDOPermission.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/security/CDOPermission.java
index 38b876df75..da26f5e1b1 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/security/CDOPermission.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/security/CDOPermission.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2012, 2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryQueue.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryQueue.java
index 310f42e1c6..4249a8f33b 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryQueue.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryQueue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2008-2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/NOOPRevisionCache.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/NOOPRevisionCache.java
index 3b71507bb9..ca79c33d4a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/NOOPRevisionCache.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/NOOPRevisionCache.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2010-2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractQueryResult.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractQueryResult.java
index 9236eb1ae9..ccee08594d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractQueryResult.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractQueryResult.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2009-2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
index 6f23f5160e..0a28f852a4 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2012, 2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java b/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
index bba02a56ee..028fb93a35 100644
--- a/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
+++ b/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2011-2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
index 6f23f5160e..0a28f852a4 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2012, 2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
index bba02a56ee..028fb93a35 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2011-2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/src/org/gastro/internal/server/OM.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/src/org/gastro/internal/server/OM.java
index e60e095919..5178247345 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/src/org/gastro/internal/server/OM.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/src/org/gastro/internal/server/OM.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2009-2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/DemoConfiguration.java b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/DemoConfiguration.java
index 961192adca..babd345bac 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/DemoConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/DemoConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2010-2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java
index aa248426ca..093062a526 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2010-2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/Server.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/Server.java
index 4bcbafbc09..0f7536535e 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/Server.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/Server.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2011-2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
index bba02a56ee..028fb93a35 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2011-2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitNotificationIndication.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitNotificationIndication.java
index b6c83795e2..80ac789edf 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitNotificationIndication.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitNotificationIndication.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2009-2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadPermissionsRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadPermissionsRequest.java
index 6f67e04715..ce1cc2d1a8 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadPermissionsRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadPermissionsRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryRequest.java
index b3f8cce85c..19a05a9597 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2009-2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.releng.apireports/about.properties b/plugins/org.eclipse.emf.cdo.releng.apireports/about.properties
index 1f81640398..0b1b258e53 100644
--- a/plugins/org.eclipse.emf.cdo.releng.apireports/about.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.apireports/about.properties
@@ -16,8 +16,8 @@
# append it to the end of the file, and change the code to use the new name.
# ==============================================================================
-featureName = CDO Release Engineering API Reports
-featureText = CDO Release Engineering API Reports\n\
+featureName = API Reports
+featureText = API Reports\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
diff --git a/plugins/org.eclipse.emf.cdo.releng.apireports/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.apireports/plugin.properties
index 8c768d8043..06f62514a3 100644
--- a/plugins/org.eclipse.emf.cdo.releng.apireports/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.apireports/plugin.properties
@@ -7,5 +7,5 @@
# Contributors:
# Eike Stepper - initial API and implementation
-pluginName = CDO Release Engineering API Reports
+pluginName = API Reports
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.cdo.releng.buildstamp/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.buildstamp/META-INF/MANIFEST.MF
index 91f0e36980..5b828f9a5d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.buildstamp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng.buildstamp/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.releng.buildstamp;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -11,4 +11,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.5.0,4.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.releng.buildstamp;version="1.0.100";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.releng.buildstamp;version="1.0.200";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.releng.buildstamp/about.properties b/plugins/org.eclipse.emf.cdo.releng.buildstamp/about.properties
index d9e33c5e22..2e2a60d77b 100644
--- a/plugins/org.eclipse.emf.cdo.releng.buildstamp/about.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.buildstamp/about.properties
@@ -16,8 +16,8 @@
# append it to the end of the file, and change the code to use the new name.
# ==============================================================================
-featureName = CDO Release Engineering Build Stamp
-featureText = CDO Release Engineering Build Stamp\n\
+featureName = Build Stamp
+featureText = Build Stamp\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
diff --git a/plugins/org.eclipse.emf.cdo.releng.buildstamp/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.buildstamp/plugin.properties
index 8de053cc92..83ba682790 100644
--- a/plugins/org.eclipse.emf.cdo.releng.buildstamp/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.buildstamp/plugin.properties
@@ -7,5 +7,5 @@
# Contributors:
# Eike Stepper - initial API and implementation
-pluginName = CDO Release Engineering Build Stamp
+pluginName = Build Stamp
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.doc/plugin.properties
index 3aa2c4d41e..79dfefab1b 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/plugin.properties
@@ -7,5 +7,5 @@
# Contributors:
# Eike Stepper - initial API and implementation
-pluginName = CDO Release Engineering Documentation Tool
+pluginName = Documentation Tool
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.cdo.releng.gitbash/about.properties b/plugins/org.eclipse.emf.cdo.releng.gitbash/about.properties
index 4fc3a727d3..d031a5a496 100644
--- a/plugins/org.eclipse.emf.cdo.releng.gitbash/about.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.gitbash/about.properties
@@ -16,8 +16,8 @@
# append it to the end of the file, and change the code to use the new name.
# ==============================================================================
-featureName = CDO Release Engineering Git Bash
-featureText = CDO Release Engineering Git Bash\n\
+featureName = Git Bash
+featureText = Git Bash\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
diff --git a/plugins/org.eclipse.emf.cdo.releng.gitbash/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.gitbash/plugin.properties
index ac538c3a24..f8078e9105 100644
--- a/plugins/org.eclipse.emf.cdo.releng.gitbash/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.gitbash/plugin.properties
@@ -7,5 +7,5 @@
# Contributors:
# Eike Stepper - initial API and implementation
-pluginName = CDO Release Engineering Git Bash
+pluginName = Git Bash
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.help/META-INF/MANIFEST.MF
index f28fd8a7fd..81b57c38f7 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng.help/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.releng.help; singleton:=true
-Bundle-Version: 4.1.100.qualifier
+Bundle-Version: 4.1.200.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -11,16 +11,16 @@ Require-Bundle: org.eclipse.help;bundle-version="[3.3.0,4.0.0)";resolution:=opti
org.eclipse.net4j.jvm;bundle-version="[4.1.0,5.0.0)",
org.eclipse.net4j.tcp;bundle-version="[4.1.0,5.0.0)",
org.eclipse.net4j.http.server;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.releng.help;version="4.1.100",
- org.eclipse.emf.cdo.releng.help.contributor;version="4.1.100",
- org.eclipse.emf.cdo.releng.help.online;version="4.1.100",
- org.eclipse.emf.cdo.releng.help.reference;version="4.1.100",
- org.eclipse.emf.cdo.releng.help.reference.api;version="4.1.100",
- org.eclipse.emf.cdo.releng.help.releng;version="4.1.100",
- org.eclipse.emf.cdo.releng.help.releng.building;version="4.1.100",
- org.eclipse.emf.cdo.releng.help.releng.promoting;version="4.1.100",
- org.eclipse.emf.cdo.releng.help.releng.provisioning;version="4.1.100",
- org.eclipse.emf.cdo.releng.help.writer;version="4.1.100",
- org.eclipse.emf.cdo.releng.help.writer.authoring;version="4.1.100",
- org.eclipse.emf.cdo.releng.help.writer.building;version="4.1.100",
- org.eclipse.emf.cdo.releng.help.writer.examples;version="4.1.100"
+Export-Package: org.eclipse.emf.cdo.releng.help;version="4.1.200",
+ org.eclipse.emf.cdo.releng.help.contributor;version="4.1.200",
+ org.eclipse.emf.cdo.releng.help.online;version="4.1.200",
+ org.eclipse.emf.cdo.releng.help.reference;version="4.1.200",
+ org.eclipse.emf.cdo.releng.help.reference.api;version="4.1.200",
+ org.eclipse.emf.cdo.releng.help.releng;version="4.1.200",
+ org.eclipse.emf.cdo.releng.help.releng.building;version="4.1.200",
+ org.eclipse.emf.cdo.releng.help.releng.promoting;version="4.1.200",
+ org.eclipse.emf.cdo.releng.help.releng.provisioning;version="4.1.200",
+ org.eclipse.emf.cdo.releng.help.writer;version="4.1.200",
+ org.eclipse.emf.cdo.releng.help.writer.authoring;version="4.1.200",
+ org.eclipse.emf.cdo.releng.help.writer.building;version="4.1.200",
+ org.eclipse.emf.cdo.releng.help.writer.examples;version="4.1.200"
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/about.properties b/plugins/org.eclipse.emf.cdo.releng.help/about.properties
index fbe4fd917c..bbf3292efb 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/about.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.help/about.properties
@@ -16,8 +16,8 @@
# append it to the end of the file, and change the code to use the new name.
# ==============================================================================
-featureName = CDO Release Engineering Documentation
-featureText = CDO Release Engineering Documentation\n\
+featureName = Documentation
+featureText = Documentation\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.help/plugin.properties
index 2d604eeb43..85e1d8a210 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.help/plugin.properties
@@ -7,5 +7,5 @@
# Contributors:
# Eike Stepper - initial API and implementation
-pluginName = CDO Release Engineering Documentation
+pluginName = Documentation
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.cdo.releng.launches/about.properties b/plugins/org.eclipse.emf.cdo.releng.launches/about.properties
index 7907aa3d07..2ae7a809c1 100644
--- a/plugins/org.eclipse.emf.cdo.releng.launches/about.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.launches/about.properties
@@ -16,8 +16,8 @@
# append it to the end of the file, and change the code to use the new name.
# ==============================================================================
-featureName = CDO Release Engineering Launch Decorator
-featureText = CDO Release Engineering Launch Decorator\n\
+featureName = Launch Decorator
+featureText = Launch Decorator\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
diff --git a/plugins/org.eclipse.emf.cdo.releng.launches/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.launches/plugin.properties
index 8907901255..d118b4e984 100644
--- a/plugins/org.eclipse.emf.cdo.releng.launches/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.launches/plugin.properties
@@ -7,5 +7,5 @@
# Contributors:
# Eike Stepper - initial API and implementation
-pluginName = CDO Release Engineering Launch Decorator
+pluginName = Launch Decorator
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.cdo.releng.manifests/about.properties b/plugins/org.eclipse.emf.cdo.releng.manifests/about.properties
index 317bc26e0a..b21334f8b0 100644
--- a/plugins/org.eclipse.emf.cdo.releng.manifests/about.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.manifests/about.properties
@@ -16,8 +16,8 @@
# append it to the end of the file, and change the code to use the new name.
# ==============================================================================
-featureName = CDO Release Engineering Manifest Opener
-featureText = CDO Release Engineering Manifest Opener\n\
+featureName = Manifest Opener
+featureText = Manifest Opener\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
diff --git a/plugins/org.eclipse.emf.cdo.releng.manifests/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.manifests/plugin.properties
index 75c24e4d29..8e2a5e3642 100644
--- a/plugins/org.eclipse.emf.cdo.releng.manifests/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.manifests/plugin.properties
@@ -7,5 +7,5 @@
# Contributors:
# Eike Stepper - initial API and implementation
-pluginName = CDO Release Engineering Manifest Opener
+pluginName = Manifest Opener
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.cdo.releng.manifests/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.manifests/plugin.xml
index 3daa4ca248..a7a6592bee 100644
--- a/plugins/org.eclipse.emf.cdo.releng.manifests/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.manifests/plugin.xml
@@ -16,7 +16,7 @@
<extension
point="org.eclipse.ui.commands">
<category
- name="CDO Release Engineering"
+ name="Release Engineering"
id="org.eclipse.emf.cdo.releng">
</category>
<command
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/about.html b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/about.html
new file mode 100644
index 0000000000..d35d5aed64
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/build.properties b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/build.properties
index 6e3e902e80..928c49d837 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/build.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/build.properties
@@ -1,10 +1,23 @@
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
#
+# Contributors:
+# Eike Stepper - initial API and implementation
+
+# NLS_MESSAGEFORMAT_VAR
bin.includes = .,\
icons/,\
META-INF/,\
plugin.xml,\
- plugin.properties
+ plugin.properties,\
+ about.html,\
+ copyright.txt
jars.compile.order = .
source.. = src/
output.. = bin/
+src.includes = about.html,\
+ copyright.txt
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/copyright.txt b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/copyright.txt
new file mode 100644
index 0000000000..1c77978050
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/copyright.txt
@@ -0,0 +1,8 @@
+Copyright (c) 2004-2013 Eike Stepper (Berlin, Germany) and others.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+
+Contributors:
+ Eike Stepper - initial API and implementation
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/plugin.properties
index 7a2524492c..baec776940 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/plugin.properties
@@ -1,7 +1,16 @@
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
#
+# Contributors:
+# Eike Stepper - initial API and implementation
-pluginName = Predicates Edit Support
-providerName = www.example.org
+# NLS_MESSAGEFORMAT_VAR
+
+pluginName = Project Predicates Edit Support
+providerName = Eclipse Modeling Project
_UI_CreateChild_text = {0}
_UI_CreateChild_text2 = {1} {0}
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/plugin.xml
index 1619d79f11..29a917e417 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/plugin.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
+<?eclipse version="3.4"?>
<!--
+ Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
-->
<plugin>
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/AndPredicateItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/AndPredicateItemProvider.java
index a2dbae205c..027942e52b 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/AndPredicateItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/AndPredicateItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.provider;
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/BuilderPredicateItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/BuilderPredicateItemProvider.java
index 10252e020d..237616b709 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/BuilderPredicateItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/BuilderPredicateItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.provider;
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/FilePredicateItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/FilePredicateItemProvider.java
index 5fbe4c56e6..14f008e2ba 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/FilePredicateItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/FilePredicateItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.provider;
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/NamePredicateItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/NamePredicateItemProvider.java
index 9052c5552f..cd592ed15d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/NamePredicateItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/NamePredicateItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.provider;
@@ -69,19 +77,12 @@ public class NamePredicateItemProvider extends ItemProviderAdapter implements IE
*/
protected void addPatternPropertyDescriptor(Object object)
{
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_NamePredicate_pattern_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_NamePredicate_pattern_feature", "_UI_NamePredicate_type"),
- PredicatesPackage.Literals.NAME_PREDICATE__PATTERN,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(
+ ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_NamePredicate_pattern_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_NamePredicate_pattern_feature", "_UI_NamePredicate_type"),
+ PredicatesPackage.Literals.NAME_PREDICATE__PATTERN, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -134,9 +135,9 @@ public class NamePredicateItemProvider extends ItemProviderAdapter implements IE
switch (notification.getFeatureID(NamePredicate.class))
{
- case PredicatesPackage.NAME_PREDICATE__PATTERN:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
+ case PredicatesPackage.NAME_PREDICATE__PATTERN:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
}
super.notifyChanged(notification);
}
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/NaturePredicateItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/NaturePredicateItemProvider.java
index 2b1990e702..386e6ca1e0 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/NaturePredicateItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/NaturePredicateItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.provider;
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/NotPredicateItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/NotPredicateItemProvider.java
index 246761d577..583d09fc1a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/NotPredicateItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/NotPredicateItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.provider;
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/OrPredicateItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/OrPredicateItemProvider.java
index 4fe4f2710a..684ae4a282 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/OrPredicateItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/OrPredicateItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.provider;
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/PredicatesEditPlugin.java b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/PredicatesEditPlugin.java
index e4e95e2a5d..28c9a6a8de 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/PredicatesEditPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/PredicatesEditPlugin.java
@@ -1,9 +1,16 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.provider;
import org.eclipse.emf.common.EMFPlugin;
-
import org.eclipse.emf.common.util.ResourceLocator;
/**
@@ -38,10 +45,7 @@ public final class PredicatesEditPlugin extends EMFPlugin
*/
public PredicatesEditPlugin()
{
- super
- (new ResourceLocator []
- {
- });
+ super(new ResourceLocator[] {});
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/PredicatesItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/PredicatesItemProviderAdapterFactory.java
index 215f8d579d..41285be7d0 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/PredicatesItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/PredicatesItemProviderAdapterFactory.java
@@ -1,23 +1,23 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.provider;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
import org.eclipse.emf.cdo.releng.predicates.PredicatesPackage;
-
import org.eclipse.emf.cdo.releng.predicates.util.PredicatesAdapterFactory;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.edit.domain.EditingDomain;
-
import org.eclipse.emf.edit.provider.ChangeNotifier;
import org.eclipse.emf.edit.provider.ChildCreationExtenderManager;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
@@ -32,6 +32,10 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
/**
* This is the factory that is used to provide the interfaces needed to support Viewers.
* The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
@@ -41,7 +45,8 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* <!-- end-user-doc -->
* @generated
*/
-public class PredicatesItemProviderAdapterFactory extends PredicatesAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender
+public class PredicatesItemProviderAdapterFactory extends PredicatesAdapterFactory implements
+ ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender
{
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
@@ -65,7 +70,8 @@ public class PredicatesItemProviderAdapterFactory extends PredicatesAdapterFacto
* <!-- end-user-doc -->
* @generated
*/
- protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(PredicatesEditPlugin.INSTANCE, PredicatesPackage.eNS_URI);
+ protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(
+ PredicatesEditPlugin.INSTANCE, PredicatesPackage.eNS_URI);
/**
* This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
@@ -346,7 +352,7 @@ public class PredicatesItemProviderAdapterFactory extends PredicatesAdapterFacto
if (isFactoryForType(type))
{
Object adapter = super.adapt(object, type);
- if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
+ if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
{
return adapter;
}
@@ -431,14 +437,38 @@ public class PredicatesItemProviderAdapterFactory extends PredicatesAdapterFacto
*/
public void dispose()
{
- if (namePredicateItemProvider != null) namePredicateItemProvider.dispose();
- if (repositoryPredicateItemProvider != null) repositoryPredicateItemProvider.dispose();
- if (andPredicateItemProvider != null) andPredicateItemProvider.dispose();
- if (orPredicateItemProvider != null) orPredicateItemProvider.dispose();
- if (notPredicateItemProvider != null) notPredicateItemProvider.dispose();
- if (naturePredicateItemProvider != null) naturePredicateItemProvider.dispose();
- if (builderPredicateItemProvider != null) builderPredicateItemProvider.dispose();
- if (filePredicateItemProvider != null) filePredicateItemProvider.dispose();
+ if (namePredicateItemProvider != null)
+ {
+ namePredicateItemProvider.dispose();
+ }
+ if (repositoryPredicateItemProvider != null)
+ {
+ repositoryPredicateItemProvider.dispose();
+ }
+ if (andPredicateItemProvider != null)
+ {
+ andPredicateItemProvider.dispose();
+ }
+ if (orPredicateItemProvider != null)
+ {
+ orPredicateItemProvider.dispose();
+ }
+ if (notPredicateItemProvider != null)
+ {
+ notPredicateItemProvider.dispose();
+ }
+ if (naturePredicateItemProvider != null)
+ {
+ naturePredicateItemProvider.dispose();
+ }
+ if (builderPredicateItemProvider != null)
+ {
+ builderPredicateItemProvider.dispose();
+ }
+ if (filePredicateItemProvider != null)
+ {
+ filePredicateItemProvider.dispose();
+ }
}
}
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/RepositoryPredicateItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/RepositoryPredicateItemProvider.java
index 1558b5f6f2..22840a12cc 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/RepositoryPredicateItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates.edit/src/org/eclipse/emf/cdo/releng/predicates/provider/RepositoryPredicateItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.provider;
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/about.ini b/plugins/org.eclipse.emf.cdo.releng.predicates/about.ini
deleted file mode 100644
index 32006ae5d6..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/about.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%featureText
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=modeling32.png
-
-# Property "appName" contains name of the application (translated)
-appName=%featureName
-
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/about.mappings b/plugins/org.eclipse.emf.cdo.releng.predicates/about.mappings
deleted file mode 100644
index bddaab4310..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@ \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/about.properties b/plugins/org.eclipse.emf.cdo.releng.predicates/about.properties
deleted file mode 100644
index 9134ef220b..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/about.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Eike Stepper - initial API and implementation
-
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-featureName = CDO Release Engineering Dynamic Working Sets
-featureText = CDO Release Engineering Dynamic Working Sets\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2004-2013 Eike Stepper (Berlin, Germany) and others. All rights reserved.\n\
-\n\
-Visit http://www.eclipse.org/cdo
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/build.properties b/plugins/org.eclipse.emf.cdo.releng.predicates/build.properties
index eb09361899..21b49823ac 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/build.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/build.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -15,11 +15,7 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
about.html,\
- about.ini,\
- about.mappings,\
- about.properties,\
copyright.txt,\
- modeling32.png,\
plugin.properties,\
model/
src.includes = about.html,\
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/modeling32.png b/plugins/org.eclipse.emf.cdo.releng.predicates/modeling32.png
deleted file mode 100644
index 6b08de2ada..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/modeling32.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.predicates/plugin.properties
index 63fbb1d409..8c837a2cf7 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/plugin.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -7,5 +7,5 @@
# Contributors:
# Eike Stepper - initial API and implementation
-pluginName = CDO Release Engineering Dynamic Working Sets
+pluginName = Project Predicates
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.predicates/plugin.xml
index 7439d1080b..311905a082 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/plugin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<!--
- Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+ Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/AndPredicate.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/AndPredicate.java
index 2498715be5..b7b3db675a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/AndPredicate.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/AndPredicate.java
@@ -1,10 +1,17 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates;
import org.eclipse.emf.common.util.EList;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>And Predicate</b></em>'.
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/BuilderPredicate.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/BuilderPredicate.java
index 06b1d7d698..f29eb77616 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/BuilderPredicate.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/BuilderPredicate.java
@@ -1,8 +1,15 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Builder Predicate</b></em>'.
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/FilePredicate.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/FilePredicate.java
index 997ad79615..d26a67e17e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/FilePredicate.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/FilePredicate.java
@@ -1,8 +1,15 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>File Predicate</b></em>'.
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/NamePredicate.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/NamePredicate.java
index 8f4803a362..a91bf82b9e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/NamePredicate.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/NamePredicate.java
@@ -1,8 +1,15 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Name Predicate</b></em>'.
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/NaturePredicate.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/NaturePredicate.java
index cc21efc2d6..57afa033fd 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/NaturePredicate.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/NaturePredicate.java
@@ -1,8 +1,15 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Nature Predicate</b></em>'.
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/NotPredicate.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/NotPredicate.java
index 1888936d80..084003ebf9 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/NotPredicate.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/NotPredicate.java
@@ -1,8 +1,15 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Not Predicate</b></em>'.
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/OrPredicate.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/OrPredicate.java
index 14456d3f87..11b0db6c4a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/OrPredicate.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/OrPredicate.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates;
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/Predicate.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/Predicate.java
index e5d45cddcc..54809b640f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/Predicate.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/Predicate.java
@@ -1,11 +1,19 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates;
-import org.eclipse.core.resources.IProject;
-
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.core.resources.IProject;
+
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Predicate</b></em>'.
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/PredicatesFactory.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/PredicatesFactory.java
index 475fa0faf3..219ca0aee4 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/PredicatesFactory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/PredicatesFactory.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates;
@@ -103,4 +111,4 @@ public interface PredicatesFactory extends EFactory
*/
PredicatesPackage getPredicatesPackage();
-} //PredicatesFactory
+} // PredicatesFactory
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/PredicatesPackage.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/PredicatesPackage.java
index 3ca78cee5f..8a8cf87f19 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/PredicatesPackage.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/PredicatesPackage.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates;
@@ -483,7 +491,6 @@ public interface PredicatesPackage extends EPackage
*/
int PROJECT = 9;
-
/**
* Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.predicates.Predicate <em>Predicate</em>}'.
* <!-- begin-user-doc -->
@@ -900,4 +907,4 @@ public interface PredicatesPackage extends EPackage
}
-} //PredicatesPackage
+} // PredicatesPackage
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/RepositoryPredicate.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/RepositoryPredicate.java
index f345e173de..3415357392 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/RepositoryPredicate.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/RepositoryPredicate.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates;
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/AndPredicateImpl.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/AndPredicateImpl.java
index 9afc3075e7..2cf3363366 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/AndPredicateImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/AndPredicateImpl.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.impl;
@@ -74,7 +82,8 @@ public class AndPredicateImpl extends MinimalEObjectImpl.Container implements An
{
if (operands == null)
{
- operands = new EObjectContainmentEList<Predicate>(Predicate.class, this, PredicatesPackage.AND_PREDICATE__OPERANDS);
+ operands = new EObjectContainmentEList<Predicate>(Predicate.class, this,
+ PredicatesPackage.AND_PREDICATE__OPERANDS);
}
return operands;
}
@@ -106,8 +115,8 @@ public class AndPredicateImpl extends MinimalEObjectImpl.Container implements An
{
switch (featureID)
{
- case PredicatesPackage.AND_PREDICATE__OPERANDS:
- return ((InternalEList<?>)getOperands()).basicRemove(otherEnd, msgs);
+ case PredicatesPackage.AND_PREDICATE__OPERANDS:
+ return ((InternalEList<?>)getOperands()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -122,8 +131,8 @@ public class AndPredicateImpl extends MinimalEObjectImpl.Container implements An
{
switch (featureID)
{
- case PredicatesPackage.AND_PREDICATE__OPERANDS:
- return getOperands();
+ case PredicatesPackage.AND_PREDICATE__OPERANDS:
+ return getOperands();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -139,10 +148,10 @@ public class AndPredicateImpl extends MinimalEObjectImpl.Container implements An
{
switch (featureID)
{
- case PredicatesPackage.AND_PREDICATE__OPERANDS:
- getOperands().clear();
- getOperands().addAll((Collection<? extends Predicate>)newValue);
- return;
+ case PredicatesPackage.AND_PREDICATE__OPERANDS:
+ getOperands().clear();
+ getOperands().addAll((Collection<? extends Predicate>)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -157,9 +166,9 @@ public class AndPredicateImpl extends MinimalEObjectImpl.Container implements An
{
switch (featureID)
{
- case PredicatesPackage.AND_PREDICATE__OPERANDS:
- getOperands().clear();
- return;
+ case PredicatesPackage.AND_PREDICATE__OPERANDS:
+ getOperands().clear();
+ return;
}
super.eUnset(featureID);
}
@@ -174,8 +183,8 @@ public class AndPredicateImpl extends MinimalEObjectImpl.Container implements An
{
switch (featureID)
{
- case PredicatesPackage.AND_PREDICATE__OPERANDS:
- return operands != null && !operands.isEmpty();
+ case PredicatesPackage.AND_PREDICATE__OPERANDS:
+ return operands != null && !operands.isEmpty();
}
return super.eIsSet(featureID);
}
@@ -190,8 +199,8 @@ public class AndPredicateImpl extends MinimalEObjectImpl.Container implements An
{
switch (operationID)
{
- case PredicatesPackage.AND_PREDICATE___MATCHES__IPROJECT:
- return matches((IProject)arguments.get(0));
+ case PredicatesPackage.AND_PREDICATE___MATCHES__IPROJECT:
+ return matches((IProject)arguments.get(0));
}
return super.eInvoke(operationID, arguments);
}
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/BuilderPredicateImpl.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/BuilderPredicateImpl.java
index a39130189b..ac34a389f6 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/BuilderPredicateImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/BuilderPredicateImpl.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.impl;
@@ -93,7 +101,10 @@ public class BuilderPredicateImpl extends MinimalEObjectImpl.Container implement
String oldBuilder = builder;
builder = newBuilder;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, PredicatesPackage.BUILDER_PREDICATE__BUILDER, oldBuilder, builder));
+ {
+ eNotify(new ENotificationImpl(this, Notification.SET, PredicatesPackage.BUILDER_PREDICATE__BUILDER, oldBuilder,
+ builder));
+ }
}
/**
@@ -135,8 +146,8 @@ public class BuilderPredicateImpl extends MinimalEObjectImpl.Container implement
{
switch (featureID)
{
- case PredicatesPackage.BUILDER_PREDICATE__BUILDER:
- return getBuilder();
+ case PredicatesPackage.BUILDER_PREDICATE__BUILDER:
+ return getBuilder();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -151,9 +162,9 @@ public class BuilderPredicateImpl extends MinimalEObjectImpl.Container implement
{
switch (featureID)
{
- case PredicatesPackage.BUILDER_PREDICATE__BUILDER:
- setBuilder((String)newValue);
- return;
+ case PredicatesPackage.BUILDER_PREDICATE__BUILDER:
+ setBuilder((String)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -168,9 +179,9 @@ public class BuilderPredicateImpl extends MinimalEObjectImpl.Container implement
{
switch (featureID)
{
- case PredicatesPackage.BUILDER_PREDICATE__BUILDER:
- setBuilder(BUILDER_EDEFAULT);
- return;
+ case PredicatesPackage.BUILDER_PREDICATE__BUILDER:
+ setBuilder(BUILDER_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -185,8 +196,8 @@ public class BuilderPredicateImpl extends MinimalEObjectImpl.Container implement
{
switch (featureID)
{
- case PredicatesPackage.BUILDER_PREDICATE__BUILDER:
- return BUILDER_EDEFAULT == null ? builder != null : !BUILDER_EDEFAULT.equals(builder);
+ case PredicatesPackage.BUILDER_PREDICATE__BUILDER:
+ return BUILDER_EDEFAULT == null ? builder != null : !BUILDER_EDEFAULT.equals(builder);
}
return super.eIsSet(featureID);
}
@@ -201,8 +212,8 @@ public class BuilderPredicateImpl extends MinimalEObjectImpl.Container implement
{
switch (operationID)
{
- case PredicatesPackage.BUILDER_PREDICATE___MATCHES__IPROJECT:
- return matches((IProject)arguments.get(0));
+ case PredicatesPackage.BUILDER_PREDICATE___MATCHES__IPROJECT:
+ return matches((IProject)arguments.get(0));
}
return super.eInvoke(operationID, arguments);
}
@@ -215,7 +226,10 @@ public class BuilderPredicateImpl extends MinimalEObjectImpl.Container implement
@Override
public String toString()
{
- if (eIsProxy()) return super.toString();
+ if (eIsProxy())
+ {
+ return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (builder: ");
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/FilePredicateImpl.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/FilePredicateImpl.java
index 4fce36e583..7242e0b5c3 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/FilePredicateImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/FilePredicateImpl.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.impl;
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/NamePredicateImpl.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/NamePredicateImpl.java
index 9ffaa7f784..62194d267f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/NamePredicateImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/NamePredicateImpl.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.impl;
@@ -91,7 +99,10 @@ public class NamePredicateImpl extends MinimalEObjectImpl.Container implements N
String oldPattern = pattern;
pattern = newPattern;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, PredicatesPackage.NAME_PREDICATE__PATTERN, oldPattern, pattern));
+ {
+ eNotify(new ENotificationImpl(this, Notification.SET, PredicatesPackage.NAME_PREDICATE__PATTERN, oldPattern,
+ pattern));
+ }
}
/**
@@ -114,8 +125,8 @@ public class NamePredicateImpl extends MinimalEObjectImpl.Container implements N
{
switch (featureID)
{
- case PredicatesPackage.NAME_PREDICATE__PATTERN:
- return getPattern();
+ case PredicatesPackage.NAME_PREDICATE__PATTERN:
+ return getPattern();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -130,9 +141,9 @@ public class NamePredicateImpl extends MinimalEObjectImpl.Container implements N
{
switch (featureID)
{
- case PredicatesPackage.NAME_PREDICATE__PATTERN:
- setPattern((String)newValue);
- return;
+ case PredicatesPackage.NAME_PREDICATE__PATTERN:
+ setPattern((String)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -147,9 +158,9 @@ public class NamePredicateImpl extends MinimalEObjectImpl.Container implements N
{
switch (featureID)
{
- case PredicatesPackage.NAME_PREDICATE__PATTERN:
- setPattern(PATTERN_EDEFAULT);
- return;
+ case PredicatesPackage.NAME_PREDICATE__PATTERN:
+ setPattern(PATTERN_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -164,8 +175,8 @@ public class NamePredicateImpl extends MinimalEObjectImpl.Container implements N
{
switch (featureID)
{
- case PredicatesPackage.NAME_PREDICATE__PATTERN:
- return PATTERN_EDEFAULT == null ? pattern != null : !PATTERN_EDEFAULT.equals(pattern);
+ case PredicatesPackage.NAME_PREDICATE__PATTERN:
+ return PATTERN_EDEFAULT == null ? pattern != null : !PATTERN_EDEFAULT.equals(pattern);
}
return super.eIsSet(featureID);
}
@@ -180,8 +191,8 @@ public class NamePredicateImpl extends MinimalEObjectImpl.Container implements N
{
switch (operationID)
{
- case PredicatesPackage.NAME_PREDICATE___MATCHES__IPROJECT:
- return matches((IProject)arguments.get(0));
+ case PredicatesPackage.NAME_PREDICATE___MATCHES__IPROJECT:
+ return matches((IProject)arguments.get(0));
}
return super.eInvoke(operationID, arguments);
}
@@ -194,7 +205,10 @@ public class NamePredicateImpl extends MinimalEObjectImpl.Container implements N
@Override
public String toString()
{
- if (eIsProxy()) return super.toString();
+ if (eIsProxy())
+ {
+ return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (pattern: ");
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/NaturePredicateImpl.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/NaturePredicateImpl.java
index 90efa6ca20..fc47f88fac 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/NaturePredicateImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/NaturePredicateImpl.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.impl;
@@ -92,7 +100,10 @@ public class NaturePredicateImpl extends MinimalEObjectImpl.Container implements
String oldNature = nature;
nature = newNature;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, PredicatesPackage.NATURE_PREDICATE__NATURE, oldNature, nature));
+ {
+ eNotify(new ENotificationImpl(this, Notification.SET, PredicatesPackage.NATURE_PREDICATE__NATURE, oldNature,
+ nature));
+ }
}
/**
@@ -130,8 +141,8 @@ public class NaturePredicateImpl extends MinimalEObjectImpl.Container implements
{
switch (featureID)
{
- case PredicatesPackage.NATURE_PREDICATE__NATURE:
- return getNature();
+ case PredicatesPackage.NATURE_PREDICATE__NATURE:
+ return getNature();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -146,9 +157,9 @@ public class NaturePredicateImpl extends MinimalEObjectImpl.Container implements
{
switch (featureID)
{
- case PredicatesPackage.NATURE_PREDICATE__NATURE:
- setNature((String)newValue);
- return;
+ case PredicatesPackage.NATURE_PREDICATE__NATURE:
+ setNature((String)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -163,9 +174,9 @@ public class NaturePredicateImpl extends MinimalEObjectImpl.Container implements
{
switch (featureID)
{
- case PredicatesPackage.NATURE_PREDICATE__NATURE:
- setNature(NATURE_EDEFAULT);
- return;
+ case PredicatesPackage.NATURE_PREDICATE__NATURE:
+ setNature(NATURE_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -180,8 +191,8 @@ public class NaturePredicateImpl extends MinimalEObjectImpl.Container implements
{
switch (featureID)
{
- case PredicatesPackage.NATURE_PREDICATE__NATURE:
- return NATURE_EDEFAULT == null ? nature != null : !NATURE_EDEFAULT.equals(nature);
+ case PredicatesPackage.NATURE_PREDICATE__NATURE:
+ return NATURE_EDEFAULT == null ? nature != null : !NATURE_EDEFAULT.equals(nature);
}
return super.eIsSet(featureID);
}
@@ -196,8 +207,8 @@ public class NaturePredicateImpl extends MinimalEObjectImpl.Container implements
{
switch (operationID)
{
- case PredicatesPackage.NATURE_PREDICATE___MATCHES__IPROJECT:
- return matches((IProject)arguments.get(0));
+ case PredicatesPackage.NATURE_PREDICATE___MATCHES__IPROJECT:
+ return matches((IProject)arguments.get(0));
}
return super.eInvoke(operationID, arguments);
}
@@ -210,7 +221,10 @@ public class NaturePredicateImpl extends MinimalEObjectImpl.Container implements
@Override
public String toString()
{
- if (eIsProxy()) return super.toString();
+ if (eIsProxy())
+ {
+ return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (nature: ");
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/NotPredicateImpl.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/NotPredicateImpl.java
index 188006e1b5..a2e7d53cba 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/NotPredicateImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/NotPredicateImpl.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.impl;
@@ -85,8 +93,16 @@ public class NotPredicateImpl extends MinimalEObjectImpl.Container implements No
operand = newOperand;
if (eNotificationRequired())
{
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PredicatesPackage.NOT_PREDICATE__OPERAND, oldOperand, newOperand);
- if (msgs == null) msgs = notification; else msgs.add(notification);
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+ PredicatesPackage.NOT_PREDICATE__OPERAND, oldOperand, newOperand);
+ if (msgs == null)
+ {
+ msgs = notification;
+ }
+ else
+ {
+ msgs.add(notification);
+ }
}
return msgs;
}
@@ -102,14 +118,26 @@ public class NotPredicateImpl extends MinimalEObjectImpl.Container implements No
{
NotificationChain msgs = null;
if (operand != null)
- msgs = ((InternalEObject)operand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PredicatesPackage.NOT_PREDICATE__OPERAND, null, msgs);
+ {
+ msgs = ((InternalEObject)operand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+ - PredicatesPackage.NOT_PREDICATE__OPERAND, null, msgs);
+ }
if (newOperand != null)
- msgs = ((InternalEObject)newOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PredicatesPackage.NOT_PREDICATE__OPERAND, null, msgs);
+ {
+ msgs = ((InternalEObject)newOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+ - PredicatesPackage.NOT_PREDICATE__OPERAND, null, msgs);
+ }
msgs = basicSetOperand(newOperand, msgs);
- if (msgs != null) msgs.dispatch();
+ if (msgs != null)
+ {
+ msgs.dispatch();
+ }
}
else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, PredicatesPackage.NOT_PREDICATE__OPERAND, newOperand, newOperand));
+ {
+ eNotify(new ENotificationImpl(this, Notification.SET, PredicatesPackage.NOT_PREDICATE__OPERAND, newOperand,
+ newOperand));
+ }
}
/**
@@ -134,8 +162,8 @@ public class NotPredicateImpl extends MinimalEObjectImpl.Container implements No
{
switch (featureID)
{
- case PredicatesPackage.NOT_PREDICATE__OPERAND:
- return basicSetOperand(null, msgs);
+ case PredicatesPackage.NOT_PREDICATE__OPERAND:
+ return basicSetOperand(null, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -150,8 +178,8 @@ public class NotPredicateImpl extends MinimalEObjectImpl.Container implements No
{
switch (featureID)
{
- case PredicatesPackage.NOT_PREDICATE__OPERAND:
- return getOperand();
+ case PredicatesPackage.NOT_PREDICATE__OPERAND:
+ return getOperand();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -166,9 +194,9 @@ public class NotPredicateImpl extends MinimalEObjectImpl.Container implements No
{
switch (featureID)
{
- case PredicatesPackage.NOT_PREDICATE__OPERAND:
- setOperand((Predicate)newValue);
- return;
+ case PredicatesPackage.NOT_PREDICATE__OPERAND:
+ setOperand((Predicate)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -183,9 +211,9 @@ public class NotPredicateImpl extends MinimalEObjectImpl.Container implements No
{
switch (featureID)
{
- case PredicatesPackage.NOT_PREDICATE__OPERAND:
- setOperand((Predicate)null);
- return;
+ case PredicatesPackage.NOT_PREDICATE__OPERAND:
+ setOperand((Predicate)null);
+ return;
}
super.eUnset(featureID);
}
@@ -200,8 +228,8 @@ public class NotPredicateImpl extends MinimalEObjectImpl.Container implements No
{
switch (featureID)
{
- case PredicatesPackage.NOT_PREDICATE__OPERAND:
- return operand != null;
+ case PredicatesPackage.NOT_PREDICATE__OPERAND:
+ return operand != null;
}
return super.eIsSet(featureID);
}
@@ -216,8 +244,8 @@ public class NotPredicateImpl extends MinimalEObjectImpl.Container implements No
{
switch (operationID)
{
- case PredicatesPackage.NOT_PREDICATE___MATCHES__IPROJECT:
- return matches((IProject)arguments.get(0));
+ case PredicatesPackage.NOT_PREDICATE___MATCHES__IPROJECT:
+ return matches((IProject)arguments.get(0));
}
return super.eInvoke(operationID, arguments);
}
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/OrPredicateImpl.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/OrPredicateImpl.java
index 808b6dee95..6d64957960 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/OrPredicateImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/OrPredicateImpl.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.impl;
@@ -106,8 +114,8 @@ public class OrPredicateImpl extends MinimalEObjectImpl.Container implements OrP
{
switch (featureID)
{
- case PredicatesPackage.OR_PREDICATE__OPERANDS:
- return ((InternalEList<?>)getOperands()).basicRemove(otherEnd, msgs);
+ case PredicatesPackage.OR_PREDICATE__OPERANDS:
+ return ((InternalEList<?>)getOperands()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -122,8 +130,8 @@ public class OrPredicateImpl extends MinimalEObjectImpl.Container implements OrP
{
switch (featureID)
{
- case PredicatesPackage.OR_PREDICATE__OPERANDS:
- return getOperands();
+ case PredicatesPackage.OR_PREDICATE__OPERANDS:
+ return getOperands();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -139,10 +147,10 @@ public class OrPredicateImpl extends MinimalEObjectImpl.Container implements OrP
{
switch (featureID)
{
- case PredicatesPackage.OR_PREDICATE__OPERANDS:
- getOperands().clear();
- getOperands().addAll((Collection<? extends Predicate>)newValue);
- return;
+ case PredicatesPackage.OR_PREDICATE__OPERANDS:
+ getOperands().clear();
+ getOperands().addAll((Collection<? extends Predicate>)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -157,9 +165,9 @@ public class OrPredicateImpl extends MinimalEObjectImpl.Container implements OrP
{
switch (featureID)
{
- case PredicatesPackage.OR_PREDICATE__OPERANDS:
- getOperands().clear();
- return;
+ case PredicatesPackage.OR_PREDICATE__OPERANDS:
+ getOperands().clear();
+ return;
}
super.eUnset(featureID);
}
@@ -174,8 +182,8 @@ public class OrPredicateImpl extends MinimalEObjectImpl.Container implements OrP
{
switch (featureID)
{
- case PredicatesPackage.OR_PREDICATE__OPERANDS:
- return operands != null && !operands.isEmpty();
+ case PredicatesPackage.OR_PREDICATE__OPERANDS:
+ return operands != null && !operands.isEmpty();
}
return super.eIsSet(featureID);
}
@@ -190,8 +198,8 @@ public class OrPredicateImpl extends MinimalEObjectImpl.Container implements OrP
{
switch (operationID)
{
- case PredicatesPackage.OR_PREDICATE___MATCHES__IPROJECT:
- return matches((IProject)arguments.get(0));
+ case PredicatesPackage.OR_PREDICATE___MATCHES__IPROJECT:
+ return matches((IProject)arguments.get(0));
}
return super.eInvoke(operationID, arguments);
}
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/PredicatesFactoryImpl.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/PredicatesFactoryImpl.java
index 856beb9893..c424486764 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/PredicatesFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/PredicatesFactoryImpl.java
@@ -1,9 +1,18 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.impl;
import org.eclipse.emf.cdo.releng.predicates.AndPredicate;
import org.eclipse.emf.cdo.releng.predicates.BuilderPredicate;
+import org.eclipse.emf.cdo.releng.predicates.FilePredicate;
import org.eclipse.emf.cdo.releng.predicates.NamePredicate;
import org.eclipse.emf.cdo.releng.predicates.NaturePredicate;
import org.eclipse.emf.cdo.releng.predicates.NotPredicate;
@@ -11,16 +20,17 @@ import org.eclipse.emf.cdo.releng.predicates.OrPredicate;
import org.eclipse.emf.cdo.releng.predicates.PredicatesFactory;
import org.eclipse.emf.cdo.releng.predicates.PredicatesPackage;
import org.eclipse.emf.cdo.releng.predicates.RepositoryPredicate;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.EFactoryImpl;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.emf.cdo.releng.predicates.*;
/**
* <!-- begin-user-doc -->
@@ -42,7 +52,8 @@ public class PredicatesFactoryImpl extends EFactoryImpl implements PredicatesFac
{
try
{
- PredicatesFactory thePredicatesFactory = (PredicatesFactory)EPackage.Registry.INSTANCE.getEFactory(PredicatesPackage.eNS_URI);
+ PredicatesFactory thePredicatesFactory = (PredicatesFactory)EPackage.Registry.INSTANCE
+ .getEFactory(PredicatesPackage.eNS_URI);
if (thePredicatesFactory != null)
{
return thePredicatesFactory;
@@ -76,16 +87,24 @@ public class PredicatesFactoryImpl extends EFactoryImpl implements PredicatesFac
{
switch (eClass.getClassifierID())
{
- case PredicatesPackage.NAME_PREDICATE: return createNamePredicate();
- case PredicatesPackage.REPOSITORY_PREDICATE: return createRepositoryPredicate();
- case PredicatesPackage.AND_PREDICATE: return createAndPredicate();
- case PredicatesPackage.OR_PREDICATE: return createOrPredicate();
- case PredicatesPackage.NOT_PREDICATE: return createNotPredicate();
- case PredicatesPackage.NATURE_PREDICATE: return createNaturePredicate();
- case PredicatesPackage.BUILDER_PREDICATE: return createBuilderPredicate();
- case PredicatesPackage.FILE_PREDICATE: return createFilePredicate();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+ case PredicatesPackage.NAME_PREDICATE:
+ return createNamePredicate();
+ case PredicatesPackage.REPOSITORY_PREDICATE:
+ return createRepositoryPredicate();
+ case PredicatesPackage.AND_PREDICATE:
+ return createAndPredicate();
+ case PredicatesPackage.OR_PREDICATE:
+ return createOrPredicate();
+ case PredicatesPackage.NOT_PREDICATE:
+ return createNotPredicate();
+ case PredicatesPackage.NATURE_PREDICATE:
+ return createNaturePredicate();
+ case PredicatesPackage.BUILDER_PREDICATE:
+ return createBuilderPredicate();
+ case PredicatesPackage.FILE_PREDICATE:
+ return createFilePredicate();
+ default:
+ throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
}
@@ -99,10 +118,10 @@ public class PredicatesFactoryImpl extends EFactoryImpl implements PredicatesFac
{
switch (eDataType.getClassifierID())
{
- case PredicatesPackage.PROJECT:
- return createProjectFromString(eDataType, initialValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+ case PredicatesPackage.PROJECT:
+ return createProjectFromString(eDataType, initialValue);
+ default:
+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
}
@@ -116,10 +135,10 @@ public class PredicatesFactoryImpl extends EFactoryImpl implements PredicatesFac
{
switch (eDataType.getClassifierID())
{
- case PredicatesPackage.PROJECT:
- return convertProjectToString(eDataType, instanceValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+ case PredicatesPackage.PROJECT:
+ return convertProjectToString(eDataType, instanceValue);
+ default:
+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
}
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/PredicatesPackageImpl.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/PredicatesPackageImpl.java
index ed68ffe2fc..c5b87b8765 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/PredicatesPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/PredicatesPackageImpl.java
@@ -1,9 +1,15 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.impl;
-import org.eclipse.core.resources.IProject;
-
import org.eclipse.emf.cdo.releng.predicates.AndPredicate;
import org.eclipse.emf.cdo.releng.predicates.BuilderPredicate;
import org.eclipse.emf.cdo.releng.predicates.FilePredicate;
@@ -22,9 +28,10 @@ import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EOperation;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.core.resources.IProject;
+
/**
* <!-- begin-user-doc -->
* An implementation of the model <b>Package</b>.
@@ -144,10 +151,14 @@ public class PredicatesPackageImpl extends EPackageImpl implements PredicatesPac
*/
public static PredicatesPackage init()
{
- if (isInited) return (PredicatesPackage)EPackage.Registry.INSTANCE.getEPackage(PredicatesPackage.eNS_URI);
+ if (isInited)
+ {
+ return (PredicatesPackage)EPackage.Registry.INSTANCE.getEPackage(PredicatesPackage.eNS_URI);
+ }
// Obtain or create and register package
- PredicatesPackageImpl thePredicatesPackage = (PredicatesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PredicatesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new PredicatesPackageImpl());
+ PredicatesPackageImpl thePredicatesPackage = (PredicatesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PredicatesPackageImpl ? EPackage.Registry.INSTANCE
+ .get(eNS_URI) : new PredicatesPackageImpl());
isInited = true;
@@ -160,7 +171,6 @@ public class PredicatesPackageImpl extends EPackageImpl implements PredicatesPac
// Mark meta-data to indicate it can't be changed
thePredicatesPackage.freeze();
-
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(PredicatesPackage.eNS_URI, thePredicatesPackage);
return thePredicatesPackage;
@@ -392,7 +402,10 @@ public class PredicatesPackageImpl extends EPackageImpl implements PredicatesPac
*/
public void createPackageContents()
{
- if (isCreated) return;
+ if (isCreated)
+ {
+ return;
+ }
isCreated = true;
// Create classes and their features
@@ -444,7 +457,10 @@ public class PredicatesPackageImpl extends EPackageImpl implements PredicatesPac
*/
public void initializePackageContents()
{
- if (isInitialized) return;
+ if (isInitialized)
+ {
+ return;
+ }
isInitialized = true;
// Initialize package
@@ -457,45 +473,69 @@ public class PredicatesPackageImpl extends EPackageImpl implements PredicatesPac
// Set bounds for type parameters
// Add supertypes to classes
- namePredicateEClass.getESuperTypes().add(this.getPredicate());
- repositoryPredicateEClass.getESuperTypes().add(this.getPredicate());
- andPredicateEClass.getESuperTypes().add(this.getPredicate());
- orPredicateEClass.getESuperTypes().add(this.getPredicate());
- notPredicateEClass.getESuperTypes().add(this.getPredicate());
- naturePredicateEClass.getESuperTypes().add(this.getPredicate());
- builderPredicateEClass.getESuperTypes().add(this.getPredicate());
- filePredicateEClass.getESuperTypes().add(this.getPredicate());
+ namePredicateEClass.getESuperTypes().add(getPredicate());
+ repositoryPredicateEClass.getESuperTypes().add(getPredicate());
+ andPredicateEClass.getESuperTypes().add(getPredicate());
+ orPredicateEClass.getESuperTypes().add(getPredicate());
+ notPredicateEClass.getESuperTypes().add(getPredicate());
+ naturePredicateEClass.getESuperTypes().add(getPredicate());
+ builderPredicateEClass.getESuperTypes().add(getPredicate());
+ filePredicateEClass.getESuperTypes().add(getPredicate());
// Initialize classes, features, and operations; add parameters
initEClass(predicateEClass, Predicate.class, "Predicate", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- EOperation op = initEOperation(getPredicate__Matches__IProject(), ecorePackage.getEBoolean(), "matches", 0, 1, IS_UNIQUE, IS_ORDERED);
- addEParameter(op, this.getProject(), "project", 0, 1, IS_UNIQUE, IS_ORDERED);
-
- initEClass(namePredicateEClass, NamePredicate.class, "NamePredicate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getNamePredicate_Pattern(), ecorePackage.getEString(), "pattern", null, 1, 1, NamePredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(repositoryPredicateEClass, RepositoryPredicate.class, "RepositoryPredicate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getRepositoryPredicate_Project(), this.getProject(), "project", null, 0, 1, RepositoryPredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(andPredicateEClass, AndPredicate.class, "AndPredicate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getAndPredicate_Operands(), this.getPredicate(), null, "operands", null, 0, -1, AndPredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(orPredicateEClass, OrPredicate.class, "OrPredicate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getOrPredicate_Operands(), this.getPredicate(), null, "operands", null, 0, -1, OrPredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(notPredicateEClass, NotPredicate.class, "NotPredicate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getNotPredicate_Operand(), this.getPredicate(), null, "operand", null, 0, 1, NotPredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(naturePredicateEClass, NaturePredicate.class, "NaturePredicate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getNaturePredicate_Nature(), ecorePackage.getEString(), "nature", null, 1, 1, NaturePredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(builderPredicateEClass, BuilderPredicate.class, "BuilderPredicate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getBuilderPredicate_Builder(), ecorePackage.getEString(), "builder", null, 1, 1, BuilderPredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(filePredicateEClass, FilePredicate.class, "FilePredicate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getFilePredicate_FilePattern(), ecorePackage.getEString(), "filePattern", null, 1, 1, FilePredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getFilePredicate_ContentPattern(), ecorePackage.getEString(), "contentPattern", null, 0, 1, FilePredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ EOperation op = initEOperation(getPredicate__Matches__IProject(), ecorePackage.getEBoolean(), "matches", 0, 1,
+ IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, getProject(), "project", 0, 1, IS_UNIQUE, IS_ORDERED);
+
+ initEClass(namePredicateEClass, NamePredicate.class, "NamePredicate", !IS_ABSTRACT, !IS_INTERFACE,
+ IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getNamePredicate_Pattern(), ecorePackage.getEString(), "pattern", null, 1, 1, NamePredicate.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(repositoryPredicateEClass, RepositoryPredicate.class, "RepositoryPredicate", !IS_ABSTRACT,
+ !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getRepositoryPredicate_Project(), getProject(), "project", null, 0, 1, RepositoryPredicate.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(andPredicateEClass, AndPredicate.class, "AndPredicate", !IS_ABSTRACT, !IS_INTERFACE,
+ IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getAndPredicate_Operands(), getPredicate(), null, "operands", null, 0, -1, AndPredicate.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+
+ initEClass(orPredicateEClass, OrPredicate.class, "OrPredicate", !IS_ABSTRACT, !IS_INTERFACE,
+ IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getOrPredicate_Operands(), getPredicate(), null, "operands", null, 0, -1, OrPredicate.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+
+ initEClass(notPredicateEClass, NotPredicate.class, "NotPredicate", !IS_ABSTRACT, !IS_INTERFACE,
+ IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getNotPredicate_Operand(), getPredicate(), null, "operand", null, 0, 1, NotPredicate.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+
+ initEClass(naturePredicateEClass, NaturePredicate.class, "NaturePredicate", !IS_ABSTRACT, !IS_INTERFACE,
+ IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getNaturePredicate_Nature(), ecorePackage.getEString(), "nature", null, 1, 1, NaturePredicate.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(builderPredicateEClass, BuilderPredicate.class, "BuilderPredicate", !IS_ABSTRACT, !IS_INTERFACE,
+ IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getBuilderPredicate_Builder(), ecorePackage.getEString(), "builder", null, 1, 1,
+ BuilderPredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+
+ initEClass(filePredicateEClass, FilePredicate.class, "FilePredicate", !IS_ABSTRACT, !IS_INTERFACE,
+ IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getFilePredicate_FilePattern(), ecorePackage.getEString(), "filePattern", null, 1, 1,
+ FilePredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getFilePredicate_ContentPattern(), ecorePackage.getEString(), "contentPattern", null, 0, 1,
+ FilePredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
// Initialize data types
initEDataType(projectEDataType, IProject.class, "Project", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
@@ -504,4 +544,4 @@ public class PredicatesPackageImpl extends EPackageImpl implements PredicatesPac
createResource(eNS_URI);
}
-} //PredicatesPackageImpl
+} // PredicatesPackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/RepositoryPredicateImpl.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/RepositoryPredicateImpl.java
index 71ea579298..eef38aac27 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/RepositoryPredicateImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/impl/RepositoryPredicateImpl.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.impl;
@@ -96,7 +104,10 @@ public class RepositoryPredicateImpl extends MinimalEObjectImpl.Container implem
IProject oldProject = project;
project = newProject;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, PredicatesPackage.REPOSITORY_PREDICATE__PROJECT, oldProject, project));
+ {
+ eNotify(new ENotificationImpl(this, Notification.SET, PredicatesPackage.REPOSITORY_PREDICATE__PROJECT,
+ oldProject, project));
+ }
}
private IPath getGitDirAbsolutePath(IProject project)
@@ -137,8 +148,8 @@ public class RepositoryPredicateImpl extends MinimalEObjectImpl.Container implem
{
switch (featureID)
{
- case PredicatesPackage.REPOSITORY_PREDICATE__PROJECT:
- return getProject();
+ case PredicatesPackage.REPOSITORY_PREDICATE__PROJECT:
+ return getProject();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -153,9 +164,9 @@ public class RepositoryPredicateImpl extends MinimalEObjectImpl.Container implem
{
switch (featureID)
{
- case PredicatesPackage.REPOSITORY_PREDICATE__PROJECT:
- setProject((IProject)newValue);
- return;
+ case PredicatesPackage.REPOSITORY_PREDICATE__PROJECT:
+ setProject((IProject)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -170,9 +181,9 @@ public class RepositoryPredicateImpl extends MinimalEObjectImpl.Container implem
{
switch (featureID)
{
- case PredicatesPackage.REPOSITORY_PREDICATE__PROJECT:
- setProject(PROJECT_EDEFAULT);
- return;
+ case PredicatesPackage.REPOSITORY_PREDICATE__PROJECT:
+ setProject(PROJECT_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -187,8 +198,8 @@ public class RepositoryPredicateImpl extends MinimalEObjectImpl.Container implem
{
switch (featureID)
{
- case PredicatesPackage.REPOSITORY_PREDICATE__PROJECT:
- return PROJECT_EDEFAULT == null ? project != null : !PROJECT_EDEFAULT.equals(project);
+ case PredicatesPackage.REPOSITORY_PREDICATE__PROJECT:
+ return PROJECT_EDEFAULT == null ? project != null : !PROJECT_EDEFAULT.equals(project);
}
return super.eIsSet(featureID);
}
@@ -203,8 +214,8 @@ public class RepositoryPredicateImpl extends MinimalEObjectImpl.Container implem
{
switch (operationID)
{
- case PredicatesPackage.REPOSITORY_PREDICATE___MATCHES__IPROJECT:
- return matches((IProject)arguments.get(0));
+ case PredicatesPackage.REPOSITORY_PREDICATE___MATCHES__IPROJECT:
+ return matches((IProject)arguments.get(0));
}
return super.eInvoke(operationID, arguments);
}
@@ -217,7 +228,10 @@ public class RepositoryPredicateImpl extends MinimalEObjectImpl.Container implem
@Override
public String toString()
{
- if (eIsProxy()) return super.toString();
+ if (eIsProxy())
+ {
+ return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (project: ");
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/util/PredicatesAdapterFactory.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/util/PredicatesAdapterFactory.java
index c1e7d939f7..27edd7a2f9 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/util/PredicatesAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/util/PredicatesAdapterFactory.java
@@ -1,14 +1,29 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.util;
-import org.eclipse.emf.cdo.releng.predicates.*;
+import org.eclipse.emf.cdo.releng.predicates.AndPredicate;
+import org.eclipse.emf.cdo.releng.predicates.BuilderPredicate;
+import org.eclipse.emf.cdo.releng.predicates.FilePredicate;
+import org.eclipse.emf.cdo.releng.predicates.NamePredicate;
+import org.eclipse.emf.cdo.releng.predicates.NaturePredicate;
+import org.eclipse.emf.cdo.releng.predicates.NotPredicate;
+import org.eclipse.emf.cdo.releng.predicates.OrPredicate;
+import org.eclipse.emf.cdo.releng.predicates.Predicate;
+import org.eclipse.emf.cdo.releng.predicates.PredicatesPackage;
+import org.eclipse.emf.cdo.releng.predicates.RepositoryPredicate;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
/**
@@ -71,60 +86,68 @@ public class PredicatesAdapterFactory extends AdapterFactoryImpl
* <!-- end-user-doc -->
* @generated
*/
- protected PredicatesSwitch<Adapter> modelSwitch =
- new PredicatesSwitch<Adapter>()
+ protected PredicatesSwitch<Adapter> modelSwitch = new PredicatesSwitch<Adapter>()
+ {
+ @Override
+ public Adapter casePredicate(Predicate object)
{
- @Override
- public Adapter casePredicate(Predicate object)
- {
- return createPredicateAdapter();
- }
- @Override
- public Adapter caseNamePredicate(NamePredicate object)
- {
- return createNamePredicateAdapter();
- }
- @Override
- public Adapter caseRepositoryPredicate(RepositoryPredicate object)
- {
- return createRepositoryPredicateAdapter();
- }
- @Override
- public Adapter caseAndPredicate(AndPredicate object)
- {
- return createAndPredicateAdapter();
- }
- @Override
- public Adapter caseOrPredicate(OrPredicate object)
- {
- return createOrPredicateAdapter();
- }
- @Override
- public Adapter caseNotPredicate(NotPredicate object)
- {
- return createNotPredicateAdapter();
- }
- @Override
- public Adapter caseNaturePredicate(NaturePredicate object)
- {
- return createNaturePredicateAdapter();
- }
- @Override
- public Adapter caseBuilderPredicate(BuilderPredicate object)
- {
- return createBuilderPredicateAdapter();
- }
- @Override
- public Adapter caseFilePredicate(FilePredicate object)
- {
- return createFilePredicateAdapter();
- }
- @Override
- public Adapter defaultCase(EObject object)
- {
- return createEObjectAdapter();
- }
- };
+ return createPredicateAdapter();
+ }
+
+ @Override
+ public Adapter caseNamePredicate(NamePredicate object)
+ {
+ return createNamePredicateAdapter();
+ }
+
+ @Override
+ public Adapter caseRepositoryPredicate(RepositoryPredicate object)
+ {
+ return createRepositoryPredicateAdapter();
+ }
+
+ @Override
+ public Adapter caseAndPredicate(AndPredicate object)
+ {
+ return createAndPredicateAdapter();
+ }
+
+ @Override
+ public Adapter caseOrPredicate(OrPredicate object)
+ {
+ return createOrPredicateAdapter();
+ }
+
+ @Override
+ public Adapter caseNotPredicate(NotPredicate object)
+ {
+ return createNotPredicateAdapter();
+ }
+
+ @Override
+ public Adapter caseNaturePredicate(NaturePredicate object)
+ {
+ return createNaturePredicateAdapter();
+ }
+
+ @Override
+ public Adapter caseBuilderPredicate(BuilderPredicate object)
+ {
+ return createBuilderPredicateAdapter();
+ }
+
+ @Override
+ public Adapter caseFilePredicate(FilePredicate object)
+ {
+ return createFilePredicateAdapter();
+ }
+
+ @Override
+ public Adapter defaultCase(EObject object)
+ {
+ return createEObjectAdapter();
+ }
+ };
/**
* Creates an adapter for the <code>target</code>.
@@ -140,7 +163,6 @@ public class PredicatesAdapterFactory extends AdapterFactoryImpl
return modelSwitch.doSwitch((EObject)target);
}
-
/**
* Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.predicates.Predicate <em>Predicate</em>}'.
* <!-- begin-user-doc -->
@@ -289,4 +311,4 @@ public class PredicatesAdapterFactory extends AdapterFactoryImpl
return null;
}
-} //PredicatesAdapterFactory
+} // PredicatesAdapterFactory
diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/util/PredicatesSwitch.java b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/util/PredicatesSwitch.java
index 359d1eac38..b9e2a94abe 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/util/PredicatesSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/src/org/eclipse/emf/cdo/releng/predicates/util/PredicatesSwitch.java
@@ -1,12 +1,28 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.predicates.util;
-import org.eclipse.emf.cdo.releng.predicates.*;
+import org.eclipse.emf.cdo.releng.predicates.AndPredicate;
+import org.eclipse.emf.cdo.releng.predicates.BuilderPredicate;
+import org.eclipse.emf.cdo.releng.predicates.FilePredicate;
+import org.eclipse.emf.cdo.releng.predicates.NamePredicate;
+import org.eclipse.emf.cdo.releng.predicates.NaturePredicate;
+import org.eclipse.emf.cdo.releng.predicates.NotPredicate;
+import org.eclipse.emf.cdo.releng.predicates.OrPredicate;
+import org.eclipse.emf.cdo.releng.predicates.Predicate;
+import org.eclipse.emf.cdo.releng.predicates.PredicatesPackage;
+import org.eclipse.emf.cdo.releng.predicates.RepositoryPredicate;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.util.Switch;
/**
@@ -72,78 +88,130 @@ public class PredicatesSwitch<T> extends Switch<T>
{
switch (classifierID)
{
- case PredicatesPackage.PREDICATE:
+ case PredicatesPackage.PREDICATE:
+ {
+ Predicate predicate = (Predicate)theEObject;
+ T result = casePredicate(predicate);
+ if (result == null)
+ {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
+ case PredicatesPackage.NAME_PREDICATE:
+ {
+ NamePredicate namePredicate = (NamePredicate)theEObject;
+ T result = caseNamePredicate(namePredicate);
+ if (result == null)
+ {
+ result = casePredicate(namePredicate);
+ }
+ if (result == null)
+ {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
+ case PredicatesPackage.REPOSITORY_PREDICATE:
+ {
+ RepositoryPredicate repositoryPredicate = (RepositoryPredicate)theEObject;
+ T result = caseRepositoryPredicate(repositoryPredicate);
+ if (result == null)
+ {
+ result = casePredicate(repositoryPredicate);
+ }
+ if (result == null)
+ {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
+ case PredicatesPackage.AND_PREDICATE:
+ {
+ AndPredicate andPredicate = (AndPredicate)theEObject;
+ T result = caseAndPredicate(andPredicate);
+ if (result == null)
+ {
+ result = casePredicate(andPredicate);
+ }
+ if (result == null)
+ {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
+ case PredicatesPackage.OR_PREDICATE:
+ {
+ OrPredicate orPredicate = (OrPredicate)theEObject;
+ T result = caseOrPredicate(orPredicate);
+ if (result == null)
+ {
+ result = casePredicate(orPredicate);
+ }
+ if (result == null)
{
- Predicate predicate = (Predicate)theEObject;
- T result = casePredicate(predicate);
- if (result == null) result = defaultCase(theEObject);
- return result;
+ result = defaultCase(theEObject);
}
- case PredicatesPackage.NAME_PREDICATE:
+ return result;
+ }
+ case PredicatesPackage.NOT_PREDICATE:
+ {
+ NotPredicate notPredicate = (NotPredicate)theEObject;
+ T result = caseNotPredicate(notPredicate);
+ if (result == null)
{
- NamePredicate namePredicate = (NamePredicate)theEObject;
- T result = caseNamePredicate(namePredicate);
- if (result == null) result = casePredicate(namePredicate);
- if (result == null) result = defaultCase(theEObject);
- return result;
+ result = casePredicate(notPredicate);
}
- case PredicatesPackage.REPOSITORY_PREDICATE:
+ if (result == null)
{
- RepositoryPredicate repositoryPredicate = (RepositoryPredicate)theEObject;
- T result = caseRepositoryPredicate(repositoryPredicate);
- if (result == null) result = casePredicate(repositoryPredicate);
- if (result == null) result = defaultCase(theEObject);
- return result;
+ result = defaultCase(theEObject);
}
- case PredicatesPackage.AND_PREDICATE:
+ return result;
+ }
+ case PredicatesPackage.NATURE_PREDICATE:
+ {
+ NaturePredicate naturePredicate = (NaturePredicate)theEObject;
+ T result = caseNaturePredicate(naturePredicate);
+ if (result == null)
{
- AndPredicate andPredicate = (AndPredicate)theEObject;
- T result = caseAndPredicate(andPredicate);
- if (result == null) result = casePredicate(andPredicate);
- if (result == null) result = defaultCase(theEObject);
- return result;
+ result = casePredicate(naturePredicate);
}
- case PredicatesPackage.OR_PREDICATE:
+ if (result == null)
{
- OrPredicate orPredicate = (OrPredicate)theEObject;
- T result = caseOrPredicate(orPredicate);
- if (result == null) result = casePredicate(orPredicate);
- if (result == null) result = defaultCase(theEObject);
- return result;
+ result = defaultCase(theEObject);
}
- case PredicatesPackage.NOT_PREDICATE:
+ return result;
+ }
+ case PredicatesPackage.BUILDER_PREDICATE:
+ {
+ BuilderPredicate builderPredicate = (BuilderPredicate)theEObject;
+ T result = caseBuilderPredicate(builderPredicate);
+ if (result == null)
{
- NotPredicate notPredicate = (NotPredicate)theEObject;
- T result = caseNotPredicate(notPredicate);
- if (result == null) result = casePredicate(notPredicate);
- if (result == null) result = defaultCase(theEObject);
- return result;
+ result = casePredicate(builderPredicate);
}
- case PredicatesPackage.NATURE_PREDICATE:
+ if (result == null)
{
- NaturePredicate naturePredicate = (NaturePredicate)theEObject;
- T result = caseNaturePredicate(naturePredicate);
- if (result == null) result = casePredicate(naturePredicate);
- if (result == null) result = defaultCase(theEObject);
- return result;
+ result = defaultCase(theEObject);
}
- case PredicatesPackage.BUILDER_PREDICATE:
+ return result;
+ }
+ case PredicatesPackage.FILE_PREDICATE:
+ {
+ FilePredicate filePredicate = (FilePredicate)theEObject;
+ T result = caseFilePredicate(filePredicate);
+ if (result == null)
{
- BuilderPredicate builderPredicate = (BuilderPredicate)theEObject;
- T result = caseBuilderPredicate(builderPredicate);
- if (result == null) result = casePredicate(builderPredicate);
- if (result == null) result = defaultCase(theEObject);
- return result;
+ result = casePredicate(filePredicate);
}
- case PredicatesPackage.FILE_PREDICATE:
+ if (result == null)
{
- FilePredicate filePredicate = (FilePredicate)theEObject;
- T result = caseFilePredicate(filePredicate);
- if (result == null) result = casePredicate(filePredicate);
- if (result == null) result = defaultCase(theEObject);
- return result;
+ result = defaultCase(theEObject);
}
- default: return defaultCase(theEObject);
+ return result;
+ }
+ default:
+ return defaultCase(theEObject);
}
}
@@ -308,4 +376,4 @@ public class PredicatesSwitch<T> extends Switch<T>
return null;
}
-} //PredicatesSwitch
+} // PredicatesSwitch
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.edit/about.html b/plugins/org.eclipse.emf.cdo.releng.preferences.edit/about.html
new file mode 100644
index 0000000000..d35d5aed64
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.edit/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.edit/build.properties b/plugins/org.eclipse.emf.cdo.releng.preferences.edit/build.properties
index 6e3e902e80..928c49d837 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences.edit/build.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.edit/build.properties
@@ -1,10 +1,23 @@
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
#
+# Contributors:
+# Eike Stepper - initial API and implementation
+
+# NLS_MESSAGEFORMAT_VAR
bin.includes = .,\
icons/,\
META-INF/,\
plugin.xml,\
- plugin.properties
+ plugin.properties,\
+ about.html,\
+ copyright.txt
jars.compile.order = .
source.. = src/
output.. = bin/
+src.includes = about.html,\
+ copyright.txt
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.edit/copyright.txt b/plugins/org.eclipse.emf.cdo.releng.preferences.edit/copyright.txt
new file mode 100644
index 0000000000..1c77978050
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.edit/copyright.txt
@@ -0,0 +1,8 @@
+Copyright (c) 2004-2013 Eike Stepper (Berlin, Germany) and others.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+
+Contributors:
+ Eike Stepper - initial API and implementation
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.edit/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.preferences.edit/plugin.properties
index 8ca07b08ce..95340cf637 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences.edit/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.edit/plugin.properties
@@ -1,7 +1,16 @@
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
#
+# Contributors:
+# Eike Stepper - initial API and implementation
-pluginName = Preferences Edit Support
-providerName = www.example.org
+# NLS_MESSAGEFORMAT_VAR
+
+pluginName = Preferences Management Edit Support
+providerName = Eclipse Modeling Project
_UI_CreateChild_text = {0}
_UI_CreateChild_text2 = {1} {0}
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.edit/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.preferences.edit/plugin.xml
index 0550154313..ebdb92c9ff 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences.edit/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.edit/plugin.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
+<?eclipse version="3.4"?>
<!--
+ Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
-->
<plugin>
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PreferenceNodeItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PreferenceNodeItemProvider.java
index 290ddc5e91..9e1a90dc8a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PreferenceNodeItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PreferenceNodeItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.preferences.provider;
@@ -71,19 +79,12 @@ public class PreferenceNodeItemProvider extends ItemProviderAdapter implements I
*/
protected void addNamePropertyDescriptor(Object object)
{
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_PreferenceNode_name_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_PreferenceNode_name_feature", "_UI_PreferenceNode_type"),
- PreferencesPackage.Literals.PREFERENCE_NODE__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(
+ ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_PreferenceNode_name_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_PreferenceNode_name_feature", "_UI_PreferenceNode_type"),
+ PreferencesPackage.Literals.PREFERENCE_NODE__NAME, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -94,19 +95,13 @@ public class PreferenceNodeItemProvider extends ItemProviderAdapter implements I
*/
protected void addLocationPropertyDescriptor(Object object)
{
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_PreferenceNode_location_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_PreferenceNode_location_feature", "_UI_PreferenceNode_type"),
- PreferencesPackage.Literals.PREFERENCE_NODE__LOCATION,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(
+ ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_PreferenceNode_location_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_PreferenceNode_location_feature",
+ "_UI_PreferenceNode_type"), PreferencesPackage.Literals.PREFERENCE_NODE__LOCATION, false, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -161,7 +156,7 @@ public class PreferenceNodeItemProvider extends ItemProviderAdapter implements I
* @generated
*/
@Override
- protected boolean shouldComposeCreationImage()
+ protected boolean shouldComposeCreationImage()
{
return true;
}
@@ -193,14 +188,14 @@ public class PreferenceNodeItemProvider extends ItemProviderAdapter implements I
switch (notification.getFeatureID(PreferenceNode.class))
{
- case PreferencesPackage.PREFERENCE_NODE__NAME:
- case PreferencesPackage.PREFERENCE_NODE__LOCATION:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case PreferencesPackage.PREFERENCE_NODE__CHILDREN:
- case PreferencesPackage.PREFERENCE_NODE__PROPERTIES:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ case PreferencesPackage.PREFERENCE_NODE__NAME:
+ case PreferencesPackage.PREFERENCE_NODE__LOCATION:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ case PreferencesPackage.PREFERENCE_NODE__CHILDREN:
+ case PreferencesPackage.PREFERENCE_NODE__PROPERTIES:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -217,15 +212,11 @@ public class PreferenceNodeItemProvider extends ItemProviderAdapter implements I
{
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (PreferencesPackage.Literals.PREFERENCE_NODE__CHILDREN,
- PreferencesFactory.eINSTANCE.createPreferenceNode()));
+ newChildDescriptors.add(createChildParameter(PreferencesPackage.Literals.PREFERENCE_NODE__CHILDREN,
+ PreferencesFactory.eINSTANCE.createPreferenceNode()));
- newChildDescriptors.add
- (createChildParameter
- (PreferencesPackage.Literals.PREFERENCE_NODE__PROPERTIES,
- PreferencesFactory.eINSTANCE.createProperty()));
+ newChildDescriptors.add(createChildParameter(PreferencesPackage.Literals.PREFERENCE_NODE__PROPERTIES,
+ PreferencesFactory.eINSTANCE.createProperty()));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PreferencesEditPlugin.java b/plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PreferencesEditPlugin.java
index 1c27a3f555..1290ccef74 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PreferencesEditPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PreferencesEditPlugin.java
@@ -1,9 +1,16 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.preferences.provider;
import org.eclipse.emf.common.EMFPlugin;
-
import org.eclipse.emf.common.util.ResourceLocator;
/**
@@ -38,10 +45,7 @@ public final class PreferencesEditPlugin extends EMFPlugin
*/
public PreferencesEditPlugin()
{
- super
- (new ResourceLocator []
- {
- });
+ super(new ResourceLocator[] {});
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PreferencesItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PreferencesItemProviderAdapterFactory.java
index 86a86d9a2b..a6b7b72676 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PreferencesItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PreferencesItemProviderAdapterFactory.java
@@ -1,16 +1,20 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.preferences.provider;
-import java.util.ArrayList;
-import java.util.Collection;
-
import org.eclipse.emf.cdo.releng.preferences.util.PreferencesAdapterFactory;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.edit.provider.ChangeNotifier;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -23,6 +27,9 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import java.util.ArrayList;
+import java.util.Collection;
+
/**
* This is the factory that is used to provide the interfaces needed to support Viewers.
* The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
@@ -32,7 +39,8 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* <!-- end-user-doc -->
* @generated
*/
-public class PreferencesItemProviderAdapterFactory extends PreferencesAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
+public class PreferencesItemProviderAdapterFactory extends PreferencesAdapterFactory implements
+ ComposeableAdapterFactory, IChangeNotifier, IDisposable
{
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
@@ -234,8 +242,10 @@ public class PreferencesItemProviderAdapterFactory extends PreferencesAdapterFac
*/
public void dispose()
{
- if (preferenceNodeItemProvider != null) preferenceNodeItemProvider.dispose();
- if (propertyItemProvider != null) propertyItemProvider.dispose();
+ if (preferenceNodeItemProvider != null)
+ preferenceNodeItemProvider.dispose();
+ if (propertyItemProvider != null)
+ propertyItemProvider.dispose();
}
}
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PropertyItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PropertyItemProvider.java
index 062549536f..8f7c93872c 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PropertyItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.edit/src/org/eclipse/emf/cdo/releng/preferences/provider/PropertyItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.preferences.provider;
@@ -69,19 +77,12 @@ public class PropertyItemProvider extends ItemProviderAdapter implements IEditin
*/
protected void addNamePropertyDescriptor(Object object)
{
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Property_name_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Property_name_feature", "_UI_Property_type"),
- PreferencesPackage.Literals.PROPERTY__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(
+ ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Property_name_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_Property_name_feature", "_UI_Property_type"),
+ PreferencesPackage.Literals.PROPERTY__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null, null));
}
/**
@@ -92,19 +93,12 @@ public class PropertyItemProvider extends ItemProviderAdapter implements IEditin
*/
protected void addValuePropertyDescriptor(Object object)
{
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Property_value_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Property_value_feature", "_UI_Property_type"),
- PreferencesPackage.Literals.PROPERTY__VALUE,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(
+ ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+ getString("_UI_Property_value_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_Property_value_feature", "_UI_Property_type"),
+ PreferencesPackage.Literals.PROPERTY__VALUE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null, null));
}
/**
@@ -158,10 +152,10 @@ public class PropertyItemProvider extends ItemProviderAdapter implements IEditin
switch (notification.getFeatureID(Property.class))
{
- case PreferencesPackage.PROPERTY__NAME:
- case PreferencesPackage.PROPERTY__VALUE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
+ case PreferencesPackage.PROPERTY__NAME:
+ case PreferencesPackage.PROPERTY__VALUE:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
}
super.notifyChanged(notification);
}
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/META-INF/MANIFEST.MF
index 02a1e35d1b..eed4a14fc5 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/META-INF/MANIFEST.MF
@@ -16,5 +16,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.edit.ui;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)"
+ org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.emf.cdo.releng.ui;bundle-version="[1.0.0,2.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/about.html b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/about.html
new file mode 100644
index 0000000000..d35d5aed64
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/build.properties b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/build.properties
index 5fb07711cf..e970acd6fa 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/build.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/build.properties
@@ -1,10 +1,23 @@
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
#
+# Contributors:
+# Eike Stepper - initial API and implementation
+
+# NLS_MESSAGEFORMAT_VAR
bin.includes = .,\
icons/,\
META-INF/,\
plugin.xml,\
- plugin.properties
+ plugin.properties,\
+ about.html,\
+ copyright.txt
jars.compile.order = .
source.. = src/
output.. = bin
+src.includes = about.html,\
+ copyright.txt
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/copyright.txt b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/copyright.txt
new file mode 100644
index 0000000000..1c77978050
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/copyright.txt
@@ -0,0 +1,8 @@
+Copyright (c) 2004-2013 Eike Stepper (Berlin, Germany) and others.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+
+Contributors:
+ Eike Stepper - initial API and implementation
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/plugin.properties
index d5012d3ed8..c1dda32e7e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/plugin.properties
@@ -1,7 +1,16 @@
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
#
+# Contributors:
+# Eike Stepper - initial API and implementation
-pluginName = Preferences Editor
-providerName = www.example.org
+# NLS_MESSAGEFORMAT_VAR
+
+pluginName = Preferences Management Editor
+providerName = Eclipse Modeling Project
_UI_PreferencesEditor_menu = &Preferences Editor
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/plugin.xml
index b36238842f..728c33e1bc 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/plugin.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
+<?eclipse version="3.4"?>
<!--
+ Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
-->
<plugin>
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/action/OpenEditorAction.java b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/action/OpenEditorAction.java
index 48d0e9a14a..6df2afe9a2 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/action/OpenEditorAction.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/action/OpenEditorAction.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2002-2006 IBM Corporation and others.
+ * Copyright (c) 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/action/ShowInExplorerAction.java b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/action/ShowInExplorerAction.java
index c475e98cee..b8a187319a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/action/ShowInExplorerAction.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/action/ShowInExplorerAction.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2002-2006 IBM Corporation and others.
+ * Copyright (c) 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/AllPreferencesPreferencePage.java b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/AllPreferencesPreferencePage.java
index b7d14eeee5..7d47dca09b 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/AllPreferencesPreferencePage.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/AllPreferencesPreferencePage.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesActionBarContributor.java b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesActionBarContributor.java
index 9cc4e96326..cf0c3dc491 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesActionBarContributor.java
@@ -1,15 +1,18 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.preferences.presentation;
-import java.util.ArrayList;
-import java.util.Collection;
-
import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-
import org.eclipse.emf.edit.ui.action.ControlAction;
import org.eclipse.emf.edit.ui.action.CreateChildAction;
import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
@@ -28,26 +31,26 @@ import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.action.SubContributionItem;
-
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.Viewer;
-
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
+import java.util.ArrayList;
+import java.util.Collection;
+
/**
* This is the action bar contributor for the Preferences model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
-public class PreferencesActionBarContributor
- extends EditingDomainActionBarContributor
- implements ISelectionChangedListener
+public class PreferencesActionBarContributor extends EditingDomainActionBarContributor implements
+ ISelectionChangedListener
{
/**
* This keeps track of the active editor.
@@ -71,22 +74,22 @@ public class PreferencesActionBarContributor
* <!-- end-user-doc -->
* @generated
*/
- protected IAction showPropertiesViewAction =
- new Action(PreferencesEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item"))
+ protected IAction showPropertiesViewAction = new Action(
+ PreferencesEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item"))
+ {
+ @Override
+ public void run()
{
- @Override
- public void run()
+ try
{
- try
- {
- getPage().showView("org.eclipse.ui.views.PropertySheet");
- }
- catch (PartInitException exception)
- {
- PreferencesEditorPlugin.INSTANCE.log(exception);
- }
+ getPage().showView("org.eclipse.ui.views.PropertySheet");
}
- };
+ catch (PartInitException exception)
+ {
+ PreferencesEditorPlugin.INSTANCE.log(exception);
+ }
+ }
+ };
/**
* This action refreshes the viewer of the current editor if the editor
@@ -95,28 +98,28 @@ public class PreferencesActionBarContributor
* <!-- end-user-doc -->
* @generated
*/
- protected IAction refreshViewerAction =
- new Action(PreferencesEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item"))
+ protected IAction refreshViewerAction = new Action(
+ PreferencesEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item"))
+ {
+ @Override
+ public boolean isEnabled()
{
- @Override
- public boolean isEnabled()
- {
- return activeEditorPart instanceof IViewerProvider;
- }
+ return activeEditorPart instanceof IViewerProvider;
+ }
- @Override
- public void run()
+ @Override
+ public void run()
+ {
+ if (activeEditorPart instanceof IViewerProvider)
{
- if (activeEditorPart instanceof IViewerProvider)
+ Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+ if (viewer != null)
{
- Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
- if (viewer != null)
- {
- viewer.refresh();
- }
+ viewer.refresh();
}
}
- };
+ }
+ };
/**
* This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
@@ -191,7 +194,9 @@ public class PreferencesActionBarContributor
{
super.contributeToMenu(menuManager);
- IMenuManager submenuManager = new MenuManager(PreferencesEditorPlugin.INSTANCE.getString("_UI_PreferencesEditor_menu"), "org.eclipse.emf.cdo.releng.preferencesMenuID");
+ IMenuManager submenuManager = new MenuManager(
+ PreferencesEditorPlugin.INSTANCE.getString("_UI_PreferencesEditor_menu"),
+ "org.eclipse.emf.cdo.releng.preferencesMenuID");
menuManager.insertAfter("additions", submenuManager);
submenuManager.add(new Separator("settings"));
submenuManager.add(new Separator("actions"));
@@ -205,19 +210,19 @@ public class PreferencesActionBarContributor
// Prepare for CreateSibling item addition or removal.
//
- createSiblingMenuManager = new MenuManager(PreferencesEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+ createSiblingMenuManager = new MenuManager(
+ PreferencesEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
submenuManager.insertBefore("additions", createSiblingMenuManager);
// Force an update because Eclipse hides empty menus now.
//
- submenuManager.addMenuListener
- (new IMenuListener()
- {
- public void menuAboutToShow(IMenuManager menuManager)
- {
- menuManager.updateAll(true);
- }
- });
+ submenuManager.addMenuListener(new IMenuListener()
+ {
+ public void menuAboutToShow(IMenuManager menuManager)
+ {
+ menuManager.updateAll(true);
+ }
+ });
addGlobalActions(submenuManager);
}
@@ -361,7 +366,8 @@ public class PreferencesActionBarContributor
* <!-- end-user-doc -->
* @generated
*/
- protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID)
+ protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions,
+ String contributionID)
{
if (actions != null)
{
@@ -378,7 +384,7 @@ public class PreferencesActionBarContributor
}
}
}
-
+
/**
* This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
* based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
@@ -448,7 +454,7 @@ public class PreferencesActionBarContributor
menuManager.insertAfter("additions-end", new Separator("ui-actions"));
menuManager.insertAfter("ui-actions", showPropertiesViewAction);
- refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
+ refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
menuManager.insertAfter("ui-actions", refreshViewerAction);
super.addGlobalActions(menuManager);
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesEditor.java b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesEditor.java
index 32f6f1e0d6..ba9f53146d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesEditor.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesEditor.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.preferences.presentation;
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesEditorPlugin.java b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesEditorPlugin.java
index 39806b2150..0a3c830ade 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesEditorPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesEditorPlugin.java
@@ -1,11 +1,17 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.preferences.presentation;
import org.eclipse.emf.common.EMFPlugin;
-
import org.eclipse.emf.common.ui.EclipseUIPlugin;
-
import org.eclipse.emf.common.util.ResourceLocator;
/**
@@ -23,7 +29,7 @@ public final class PreferencesEditorPlugin extends EMFPlugin
* @generated
*/
public static final PreferencesEditorPlugin INSTANCE = new PreferencesEditorPlugin();
-
+
/**
* Keep track of the singleton.
* <!-- begin-user-doc -->
@@ -40,10 +46,7 @@ public final class PreferencesEditorPlugin extends EMFPlugin
*/
public PreferencesEditorPlugin()
{
- super
- (new ResourceLocator []
- {
- });
+ super(new ResourceLocator[] {});
}
/**
@@ -58,7 +61,7 @@ public final class PreferencesEditorPlugin extends EMFPlugin
{
return plugin;
}
-
+
/**
* Returns the singleton instance of the Eclipse plugin.
* <!-- begin-user-doc -->
@@ -70,7 +73,7 @@ public final class PreferencesEditorPlugin extends EMFPlugin
{
return plugin;
}
-
+
/**
* The actual implementation of the Eclipse <b>Plugin</b>.
* <!-- begin-user-doc -->
@@ -88,7 +91,7 @@ public final class PreferencesEditorPlugin extends EMFPlugin
public Implementation()
{
super();
-
+
// Remember the static instance.
//
plugin = this;
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesModelWizard.java b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesModelWizard.java
index c734961afe..22022967f7 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesModelWizard.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences.editor/src/org/eclipse/emf/cdo/releng/preferences/presentation/PreferencesModelWizard.java
@@ -1,34 +1,28 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.preferences.presentation;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.StringTokenizer;
+import org.eclipse.emf.cdo.releng.preferences.PreferencesFactory;
+import org.eclipse.emf.cdo.releng.preferences.PreferencesPackage;
+import org.eclipse.emf.cdo.releng.preferences.provider.PreferencesEditPlugin;
import org.eclipse.emf.common.CommonPlugin;
-
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClassifier;
-
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
-
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
-
import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
import org.eclipse.core.resources.IContainer;
@@ -37,53 +31,42 @@ import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
-
import org.eclipse.core.runtime.IProgressMonitor;
-
+import org.eclipse.core.runtime.Path;
import org.eclipse.jface.dialogs.MessageDialog;
-
+import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-
+import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
-
import org.eclipse.swt.SWT;
-
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.ModifyEvent;
-
+import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
-
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
-
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-
-import org.eclipse.emf.cdo.releng.preferences.PreferencesFactory;
-import org.eclipse.emf.cdo.releng.preferences.PreferencesPackage;
-import org.eclipse.emf.cdo.releng.preferences.provider.PreferencesEditPlugin;
-
-
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
/**
* This is a simple wizard for creating a new model file.
@@ -99,8 +82,9 @@ public class PreferencesModelWizard extends Wizard implements INewWizard
* <!-- end-user-doc -->
* @generated
*/
- public static final List<String> FILE_EXTENSIONS =
- Collections.unmodifiableList(Arrays.asList(PreferencesEditorPlugin.INSTANCE.getString("_UI_PreferencesEditorFilenameExtensions").split("\\s*,\\s*")));
+ public static final List<String> FILE_EXTENSIONS = Collections
+ .unmodifiableList(Arrays.asList(PreferencesEditorPlugin.INSTANCE.getString(
+ "_UI_PreferencesEditorFilenameExtensions").split("\\s*,\\s*")));
/**
* A formatted list of supported file extensions, suitable for display.
@@ -108,8 +92,8 @@ public class PreferencesModelWizard extends Wizard implements INewWizard
* <!-- end-user-doc -->
* @generated
*/
- public static final String FORMATTED_FILE_EXTENSIONS =
- PreferencesEditorPlugin.INSTANCE.getString("_UI_PreferencesEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+ public static final String FORMATTED_FILE_EXTENSIONS = PreferencesEditorPlugin.INSTANCE.getString(
+ "_UI_PreferencesEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
/**
* This caches an instance of the model package.
@@ -178,7 +162,8 @@ public class PreferencesModelWizard extends Wizard implements INewWizard
this.workbench = workbench;
this.selection = selection;
setWindowTitle(PreferencesEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
- setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(PreferencesEditorPlugin.INSTANCE.getImage("full/wizban/NewPreferences")));
+ setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(PreferencesEditorPlugin.INSTANCE
+ .getImage("full/wizban/NewPreferences")));
}
/**
@@ -238,50 +223,49 @@ public class PreferencesModelWizard extends Wizard implements INewWizard
// Do the work within an operation.
//
- WorkspaceModifyOperation operation =
- new WorkspaceModifyOperation()
+ WorkspaceModifyOperation operation = new WorkspaceModifyOperation()
+ {
+ @Override
+ protected void execute(IProgressMonitor progressMonitor)
{
- @Override
- protected void execute(IProgressMonitor progressMonitor)
+ try
{
- try
- {
- // Create a resource set
- //
- ResourceSet resourceSet = new ResourceSetImpl();
-
- // Get the URI of the model file.
- //
- URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
-
- // Create a resource for this file.
- //
- Resource resource = resourceSet.createResource(fileURI);
-
- // Add the initial model object to the contents.
- //
- EObject rootObject = createInitialModel();
- if (rootObject != null)
- {
- resource.getContents().add(rootObject);
- }
-
- // Save the contents of the resource to the file system.
- //
- Map<Object, Object> options = new HashMap<Object, Object>();
- options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
- resource.save(options);
- }
- catch (Exception exception)
+ // Create a resource set
+ //
+ ResourceSet resourceSet = new ResourceSetImpl();
+
+ // Get the URI of the model file.
+ //
+ URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+ // Create a resource for this file.
+ //
+ Resource resource = resourceSet.createResource(fileURI);
+
+ // Add the initial model object to the contents.
+ //
+ EObject rootObject = createInitialModel();
+ if (rootObject != null)
{
- PreferencesEditorPlugin.INSTANCE.log(exception);
- }
- finally
- {
- progressMonitor.done();
+ resource.getContents().add(rootObject);
}
+
+ // Save the contents of the resource to the file system.
+ //
+ Map<Object, Object> options = new HashMap<Object, Object>();
+ options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+ resource.save(options);
}
- };
+ catch (Exception exception)
+ {
+ PreferencesEditorPlugin.INSTANCE.log(exception);
+ }
+ finally
+ {
+ progressMonitor.done();
+ }
+ }
+ };
getContainer().run(false, false, operation);
@@ -293,27 +277,26 @@ public class PreferencesModelWizard extends Wizard implements INewWizard
if (activePart instanceof ISetSelectionTarget)
{
final ISelection targetSelection = new StructuredSelection(modelFile);
- getShell().getDisplay().asyncExec
- (new Runnable()
- {
- public void run()
- {
- ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
- }
- });
+ getShell().getDisplay().asyncExec(new Runnable()
+ {
+ public void run()
+ {
+ ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+ }
+ });
}
// Open an editor on the new file.
//
try
{
- page.openEditor
- (new FileEditorInput(modelFile),
- workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
+ page.openEditor(new FileEditorInput(modelFile),
+ workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
}
catch (PartInitException exception)
{
- MessageDialog.openError(workbenchWindow.getShell(), PreferencesEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+ MessageDialog.openError(workbenchWindow.getShell(),
+ PreferencesEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
return false;
}
@@ -360,7 +343,7 @@ public class PreferencesModelWizard extends Wizard implements INewWizard
if (extension == null || !FILE_EXTENSIONS.contains(extension))
{
String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";
- setErrorMessage(PreferencesEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+ setErrorMessage(PreferencesEditorPlugin.INSTANCE.getString(key, new Object[] { FORMATTED_FILE_EXTENSIONS }));
return false;
}
return true;
@@ -501,14 +484,13 @@ public class PreferencesModelWizard extends Wizard implements INewWizard
* <!-- end-user-doc -->
* @generated
*/
- protected ModifyListener validator =
- new ModifyListener()
+ protected ModifyListener validator = new ModifyListener()
+ {
+ public void modifyText(ModifyEvent e)
{
- public void modifyText(ModifyEvent e)
- {
- setPageComplete(validatePage());
- }
- };
+ setPageComplete(validatePage());
+ }
+ };
/**
* <!-- begin-user-doc -->
@@ -585,7 +567,7 @@ public class PreferencesModelWizard extends Wizard implements INewWizard
{
return PreferencesEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");
}
- catch(MissingResourceException mre)
+ catch (MissingResourceException mre)
{
PreferencesEditorPlugin.INSTANCE.log(mre);
}
@@ -602,7 +584,8 @@ public class PreferencesModelWizard extends Wizard implements INewWizard
if (encodings == null)
{
encodings = new ArrayList<String>();
- for (StringTokenizer stringTokenizer = new StringTokenizer(PreferencesEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); )
+ for (StringTokenizer stringTokenizer = new StringTokenizer(
+ PreferencesEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();)
{
encodings.add(stringTokenizer.nextToken());
}
@@ -617,15 +600,17 @@ public class PreferencesModelWizard extends Wizard implements INewWizard
* <!-- end-user-doc -->
* @generated
*/
- @Override
+ @Override
public void addPages()
{
// Create a page, set the title, and the initial model file name.
//
newFileCreationPage = new PreferencesModelWizardNewFileCreationPage("Whatever", selection);
newFileCreationPage.setTitle(PreferencesEditorPlugin.INSTANCE.getString("_UI_PreferencesModelWizard_label"));
- newFileCreationPage.setDescription(PreferencesEditorPlugin.INSTANCE.getString("_UI_PreferencesModelWizard_description"));
- newFileCreationPage.setFileName(PreferencesEditorPlugin.INSTANCE.getString("_UI_PreferencesEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
+ newFileCreationPage.setDescription(PreferencesEditorPlugin.INSTANCE
+ .getString("_UI_PreferencesModelWizard_description"));
+ newFileCreationPage.setFileName(PreferencesEditorPlugin.INSTANCE
+ .getString("_UI_PreferencesEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
addPage(newFileCreationPage);
// Try and get the resource selection to determine a current directory for the file dialog.
@@ -655,7 +640,8 @@ public class PreferencesModelWizard extends Wizard implements INewWizard
// Make up a unique new name here.
//
- String defaultModelBaseFilename = PreferencesEditorPlugin.INSTANCE.getString("_UI_PreferencesEditorFilenameDefaultBase");
+ String defaultModelBaseFilename = PreferencesEditorPlugin.INSTANCE
+ .getString("_UI_PreferencesEditorFilenameDefaultBase");
String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i)
@@ -668,7 +654,8 @@ public class PreferencesModelWizard extends Wizard implements INewWizard
}
initialObjectCreationPage = new PreferencesModelWizardInitialObjectCreationPage("Whatever2");
initialObjectCreationPage.setTitle(PreferencesEditorPlugin.INSTANCE.getString("_UI_PreferencesModelWizard_label"));
- initialObjectCreationPage.setDescription(PreferencesEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
+ initialObjectCreationPage.setDescription(PreferencesEditorPlugin.INSTANCE
+ .getString("_UI_Wizard_initial_object_description"));
addPage(initialObjectCreationPage);
}
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences/about.properties b/plugins/org.eclipse.emf.cdo.releng.preferences/about.properties
index 9134ef220b..f582b77dec 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences/about.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences/about.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -16,16 +16,8 @@
# append it to the end of the file, and change the code to use the new name.
# ==============================================================================
-featureName = CDO Release Engineering Dynamic Working Sets
-featureText = CDO Release Engineering Dynamic Working Sets\n\
+featureName = Preferences Management
+featureText = Preferences Management\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-Copyright (c) 2004-2013 Eike Stepper (Berlin, Germany) and others. All rights reserved.\n\
-\n\
-Visit http://www.eclipse.org/cdo
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences/build.properties b/plugins/org.eclipse.emf.cdo.releng.preferences/build.properties
index eb09361899..a85815f30a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences/build.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences/build.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.preferences/plugin.properties
index 63fbb1d409..6712540daf 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences/plugin.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -7,5 +7,5 @@
# Contributors:
# Eike Stepper - initial API and implementation
-pluginName = CDO Release Engineering Dynamic Working Sets
+pluginName = Preferences Management
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.preferences/plugin.xml
index 479676ab3c..32c89832cf 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences/plugin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<!--
- Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+ Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/PreferenceNode.java b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/PreferenceNode.java
index 35c5597b3c..9b24a2c5d4 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/PreferenceNode.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/PreferenceNode.java
@@ -1,9 +1,16 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.preferences;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
/**
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/PreferencesFactory.java b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/PreferencesFactory.java
index 427a8cb217..942882d95d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/PreferencesFactory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/PreferencesFactory.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.preferences;
@@ -49,4 +57,4 @@ public interface PreferencesFactory extends EFactory
*/
PreferencesPackage getPreferencesPackage();
-} //PreferencesFactory
+} // PreferencesFactory
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/PreferencesPackage.java b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/PreferencesPackage.java
index d8b8bf4ece..60a5a5d17a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/PreferencesPackage.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/PreferencesPackage.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.preferences;
@@ -205,7 +213,6 @@ public interface PreferencesPackage extends EPackage
*/
int PROPERTY_OPERATION_COUNT = 0;
-
/**
* The meta object id for the '<em>Escaped String</em>' data type.
* <!-- begin-user-doc -->
@@ -216,7 +223,6 @@ public interface PreferencesPackage extends EPackage
*/
int ESCAPED_STRING = 2;
-
/**
* Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.preferences.PreferenceNode <em>Preference Node</em>}'.
* <!-- begin-user-doc -->
@@ -492,4 +498,4 @@ public interface PreferencesPackage extends EPackage
}
-} //PreferencesPackage
+} // PreferencesPackage
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/Property.java b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/Property.java
index 2df74423c5..841a63c39f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/Property.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/Property.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.preferences;
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PreferenceNodeImpl.java b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PreferenceNodeImpl.java
index 92abb11f66..676f11b81f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PreferenceNodeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PreferenceNodeImpl.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.preferences.impl;
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PreferencesFactoryImpl.java b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PreferencesFactoryImpl.java
index 73af81b8a4..74db45a863 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PreferencesFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PreferencesFactoryImpl.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.preferences.impl;
@@ -6,6 +14,7 @@ import org.eclipse.emf.cdo.releng.preferences.PreferenceNode;
import org.eclipse.emf.cdo.releng.preferences.PreferencesFactory;
import org.eclipse.emf.cdo.releng.preferences.PreferencesPackage;
import org.eclipse.emf.cdo.releng.preferences.Property;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
@@ -31,7 +40,8 @@ public class PreferencesFactoryImpl extends EFactoryImpl implements PreferencesF
{
try
{
- PreferencesFactory thePreferencesFactory = (PreferencesFactory)EPackage.Registry.INSTANCE.getEFactory(PreferencesPackage.eNS_URI);
+ PreferencesFactory thePreferencesFactory = (PreferencesFactory)EPackage.Registry.INSTANCE
+ .getEFactory(PreferencesPackage.eNS_URI);
if (thePreferencesFactory != null)
{
return thePreferencesFactory;
@@ -65,10 +75,12 @@ public class PreferencesFactoryImpl extends EFactoryImpl implements PreferencesF
{
switch (eClass.getClassifierID())
{
- case PreferencesPackage.PREFERENCE_NODE: return createPreferenceNode();
- case PreferencesPackage.PROPERTY: return createProperty();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+ case PreferencesPackage.PREFERENCE_NODE:
+ return createPreferenceNode();
+ case PreferencesPackage.PROPERTY:
+ return createProperty();
+ default:
+ throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
}
@@ -82,10 +94,10 @@ public class PreferencesFactoryImpl extends EFactoryImpl implements PreferencesF
{
switch (eDataType.getClassifierID())
{
- case PreferencesPackage.ESCAPED_STRING:
- return createEscapedStringFromString(eDataType, initialValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+ case PreferencesPackage.ESCAPED_STRING:
+ return createEscapedStringFromString(eDataType, initialValue);
+ default:
+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
}
@@ -99,10 +111,10 @@ public class PreferencesFactoryImpl extends EFactoryImpl implements PreferencesF
{
switch (eDataType.getClassifierID())
{
- case PreferencesPackage.ESCAPED_STRING:
- return convertEscapedStringToString(eDataType, instanceValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+ case PreferencesPackage.ESCAPED_STRING:
+ return convertEscapedStringToString(eDataType, instanceValue);
+ default:
+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
}
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PreferencesPackageImpl.java b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PreferencesPackageImpl.java
index dcc7b03510..1def78d942 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PreferencesPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PreferencesPackageImpl.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.preferences.impl;
@@ -13,7 +21,6 @@ import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EOperation;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
/**
@@ -86,10 +93,12 @@ public class PreferencesPackageImpl extends EPackageImpl implements PreferencesP
*/
public static PreferencesPackage init()
{
- if (isInited) return (PreferencesPackage)EPackage.Registry.INSTANCE.getEPackage(PreferencesPackage.eNS_URI);
+ if (isInited)
+ return (PreferencesPackage)EPackage.Registry.INSTANCE.getEPackage(PreferencesPackage.eNS_URI);
// Obtain or create and register package
- PreferencesPackageImpl thePreferencesPackage = (PreferencesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PreferencesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new PreferencesPackageImpl());
+ PreferencesPackageImpl thePreferencesPackage = (PreferencesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PreferencesPackageImpl ? EPackage.Registry.INSTANCE
+ .get(eNS_URI) : new PreferencesPackageImpl());
isInited = true;
@@ -102,7 +111,6 @@ public class PreferencesPackageImpl extends EPackageImpl implements PreferencesP
// Mark meta-data to indicate it can't be changed
thePreferencesPackage.freeze();
-
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(PreferencesPackage.eNS_URI, thePreferencesPackage);
return thePreferencesPackage;
@@ -264,7 +272,8 @@ public class PreferencesPackageImpl extends EPackageImpl implements PreferencesP
*/
public void createPackageContents()
{
- if (isCreated) return;
+ if (isCreated)
+ return;
isCreated = true;
// Create classes and their features
@@ -302,7 +311,8 @@ public class PreferencesPackageImpl extends EPackageImpl implements PreferencesP
*/
public void initializePackageContents()
{
- if (isInitialized) return;
+ if (isInitialized)
+ return;
isInitialized = true;
// Initialize package
@@ -317,25 +327,41 @@ public class PreferencesPackageImpl extends EPackageImpl implements PreferencesP
// Add supertypes to classes
// Initialize classes, features, and operations; add parameters
- initEClass(preferenceNodeEClass, PreferenceNode.class, "PreferenceNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPreferenceNode_Children(), this.getPreferenceNode(), this.getPreferenceNode_Parent(), "children", null, 0, -1, PreferenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(preferenceNodeEClass, PreferenceNode.class, "PreferenceNode", !IS_ABSTRACT, !IS_INTERFACE,
+ IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getPreferenceNode_Children(), this.getPreferenceNode(), this.getPreferenceNode_Parent(), "children",
+ null, 0, -1, PreferenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+ !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
getPreferenceNode_Children().getEKeys().add(this.getPreferenceNode_Name());
- initEReference(getPreferenceNode_Parent(), this.getPreferenceNode(), this.getPreferenceNode_Children(), "parent", null, 0, 1, PreferenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPreferenceNode_Properties(), this.getProperty(), this.getProperty_Parent(), "properties", null, 0, -1, PreferenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getPreferenceNode_Parent(), this.getPreferenceNode(), this.getPreferenceNode_Children(), "parent",
+ null, 0, 1, PreferenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+ !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getPreferenceNode_Properties(), this.getProperty(), this.getProperty_Parent(), "properties", null,
+ 0, -1, PreferenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
getPreferenceNode_Properties().getEKeys().add(this.getProperty_Name());
- initEAttribute(getPreferenceNode_Name(), ecorePackage.getEString(), "name", null, 1, 1, PreferenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPreferenceNode_Location(), ecorePackage.getEString(), "location", null, 0, 1, PreferenceNode.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
- EOperation op = initEOperation(getPreferenceNode__GetNode__String(), this.getPreferenceNode(), "getNode", 0, 1, IS_UNIQUE, IS_ORDERED);
+ initEAttribute(getPreferenceNode_Name(), ecorePackage.getEString(), "name", null, 1, 1, PreferenceNode.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getPreferenceNode_Location(), ecorePackage.getEString(), "location", null, 0, 1,
+ PreferenceNode.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED,
+ IS_ORDERED);
+
+ EOperation op = initEOperation(getPreferenceNode__GetNode__String(), this.getPreferenceNode(), "getNode", 0, 1,
+ IS_UNIQUE, IS_ORDERED);
addEParameter(op, ecorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED);
- op = initEOperation(getPreferenceNode__GetProperty__String(), this.getProperty(), "getProperty", 0, 1, IS_UNIQUE, IS_ORDERED);
+ op = initEOperation(getPreferenceNode__GetProperty__String(), this.getProperty(), "getProperty", 0, 1, IS_UNIQUE,
+ IS_ORDERED);
addEParameter(op, ecorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED);
initEClass(propertyEClass, Property.class, "Property", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getProperty_Name(), ecorePackage.getEString(), "name", null, 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getProperty_Parent(), this.getPreferenceNode(), this.getPreferenceNode_Properties(), "parent", null, 0, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getProperty_Value(), this.getEscapedString(), "value", null, 0, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getProperty_Name(), ecorePackage.getEString(), "name", null, 1, 1, Property.class, !IS_TRANSIENT,
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getProperty_Parent(), this.getPreferenceNode(), this.getPreferenceNode_Properties(), "parent", null,
+ 0, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getProperty_Value(), this.getEscapedString(), "value", null, 0, 1, Property.class, !IS_TRANSIENT,
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Initialize data types
initEDataType(escapedStringEDataType, String.class, "EscapedString", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
@@ -344,4 +370,4 @@ public class PreferencesPackageImpl extends EPackageImpl implements PreferencesP
createResource(eNS_URI);
}
-} //PreferencesPackageImpl
+} // PreferencesPackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PropertyImpl.java b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PropertyImpl.java
index 8319e1e9b7..896a5977a3 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PropertyImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/impl/PropertyImpl.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.preferences.impl;
@@ -8,13 +16,10 @@ import org.eclipse.emf.cdo.releng.preferences.Property;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
import org.eclipse.emf.ecore.util.EcoreUtil;
/**
@@ -125,7 +130,8 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper
*/
public PreferenceNode getParent()
{
- if (eContainerFeatureID() != PreferencesPackage.PROPERTY__PARENT) return null;
+ if (eContainerFeatureID() != PreferencesPackage.PROPERTY__PARENT)
+ return null;
return (PreferenceNode)eInternalContainer();
}
@@ -147,7 +153,8 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper
*/
public void setParent(PreferenceNode newParent)
{
- if (newParent != eInternalContainer() || (eContainerFeatureID() != PreferencesPackage.PROPERTY__PARENT && newParent != null))
+ if (newParent != eInternalContainer()
+ || (eContainerFeatureID() != PreferencesPackage.PROPERTY__PARENT && newParent != null))
{
if (EcoreUtil.isAncestor(this, newParent))
throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
@@ -155,9 +162,11 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper
if (eInternalContainer() != null)
msgs = eBasicRemoveFromContainer(msgs);
if (newParent != null)
- msgs = ((InternalEObject)newParent).eInverseAdd(this, PreferencesPackage.PREFERENCE_NODE__PROPERTIES, PreferenceNode.class, msgs);
+ msgs = ((InternalEObject)newParent).eInverseAdd(this, PreferencesPackage.PREFERENCE_NODE__PROPERTIES,
+ PreferenceNode.class, msgs);
msgs = basicSetParent(newParent, msgs);
- if (msgs != null) msgs.dispatch();
+ if (msgs != null)
+ msgs.dispatch();
}
else if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, PreferencesPackage.PROPERTY__PARENT, newParent, newParent));
@@ -196,10 +205,10 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper
{
switch (featureID)
{
- case PreferencesPackage.PROPERTY__PARENT:
- if (eInternalContainer() != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return basicSetParent((PreferenceNode)otherEnd, msgs);
+ case PreferencesPackage.PROPERTY__PARENT:
+ if (eInternalContainer() != null)
+ msgs = eBasicRemoveFromContainer(msgs);
+ return basicSetParent((PreferenceNode)otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
@@ -214,8 +223,8 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper
{
switch (featureID)
{
- case PreferencesPackage.PROPERTY__PARENT:
- return basicSetParent(null, msgs);
+ case PreferencesPackage.PROPERTY__PARENT:
+ return basicSetParent(null, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -230,8 +239,9 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper
{
switch (eContainerFeatureID())
{
- case PreferencesPackage.PROPERTY__PARENT:
- return eInternalContainer().eInverseRemove(this, PreferencesPackage.PREFERENCE_NODE__PROPERTIES, PreferenceNode.class, msgs);
+ case PreferencesPackage.PROPERTY__PARENT:
+ return eInternalContainer().eInverseRemove(this, PreferencesPackage.PREFERENCE_NODE__PROPERTIES,
+ PreferenceNode.class, msgs);
}
return super.eBasicRemoveFromContainerFeature(msgs);
}
@@ -246,12 +256,12 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper
{
switch (featureID)
{
- case PreferencesPackage.PROPERTY__NAME:
- return getName();
- case PreferencesPackage.PROPERTY__PARENT:
- return getParent();
- case PreferencesPackage.PROPERTY__VALUE:
- return getValue();
+ case PreferencesPackage.PROPERTY__NAME:
+ return getName();
+ case PreferencesPackage.PROPERTY__PARENT:
+ return getParent();
+ case PreferencesPackage.PROPERTY__VALUE:
+ return getValue();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -266,15 +276,15 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper
{
switch (featureID)
{
- case PreferencesPackage.PROPERTY__NAME:
- setName((String)newValue);
- return;
- case PreferencesPackage.PROPERTY__PARENT:
- setParent((PreferenceNode)newValue);
- return;
- case PreferencesPackage.PROPERTY__VALUE:
- setValue((String)newValue);
- return;
+ case PreferencesPackage.PROPERTY__NAME:
+ setName((String)newValue);
+ return;
+ case PreferencesPackage.PROPERTY__PARENT:
+ setParent((PreferenceNode)newValue);
+ return;
+ case PreferencesPackage.PROPERTY__VALUE:
+ setValue((String)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -289,15 +299,15 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper
{
switch (featureID)
{
- case PreferencesPackage.PROPERTY__NAME:
- setName(NAME_EDEFAULT);
- return;
- case PreferencesPackage.PROPERTY__PARENT:
- setParent((PreferenceNode)null);
- return;
- case PreferencesPackage.PROPERTY__VALUE:
- setValue(VALUE_EDEFAULT);
- return;
+ case PreferencesPackage.PROPERTY__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ case PreferencesPackage.PROPERTY__PARENT:
+ setParent((PreferenceNode)null);
+ return;
+ case PreferencesPackage.PROPERTY__VALUE:
+ setValue(VALUE_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -312,12 +322,12 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper
{
switch (featureID)
{
- case PreferencesPackage.PROPERTY__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case PreferencesPackage.PROPERTY__PARENT:
- return getParent() != null;
- case PreferencesPackage.PROPERTY__VALUE:
- return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+ case PreferencesPackage.PROPERTY__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ case PreferencesPackage.PROPERTY__PARENT:
+ return getParent() != null;
+ case PreferencesPackage.PROPERTY__VALUE:
+ return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
}
return super.eIsSet(featureID);
}
@@ -330,7 +340,8 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper
@Override
public String toString()
{
- if (eIsProxy()) return super.toString();
+ if (eIsProxy())
+ return super.toString();
StringBuffer result = new StringBuffer(super.toString());
result.append(" (name: ");
@@ -341,4 +352,4 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper
return result.toString();
}
-} //PropertyImpl
+} // PropertyImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/util/PreferencesAdapterFactory.java b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/util/PreferencesAdapterFactory.java
index 41057ad260..c8280c760a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/util/PreferencesAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/util/PreferencesAdapterFactory.java
@@ -1,14 +1,22 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.preferences.util;
-import org.eclipse.emf.cdo.releng.preferences.*;
+import org.eclipse.emf.cdo.releng.preferences.PreferenceNode;
+import org.eclipse.emf.cdo.releng.preferences.PreferencesPackage;
+import org.eclipse.emf.cdo.releng.preferences.Property;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
/**
@@ -71,25 +79,26 @@ public class PreferencesAdapterFactory extends AdapterFactoryImpl
* <!-- end-user-doc -->
* @generated
*/
- protected PreferencesSwitch<Adapter> modelSwitch =
- new PreferencesSwitch<Adapter>()
+ protected PreferencesSwitch<Adapter> modelSwitch = new PreferencesSwitch<Adapter>()
+ {
+ @Override
+ public Adapter casePreferenceNode(PreferenceNode object)
+ {
+ return createPreferenceNodeAdapter();
+ }
+
+ @Override
+ public Adapter caseProperty(Property object)
+ {
+ return createPropertyAdapter();
+ }
+
+ @Override
+ public Adapter defaultCase(EObject object)
{
- @Override
- public Adapter casePreferenceNode(PreferenceNode object)
- {
- return createPreferenceNodeAdapter();
- }
- @Override
- public Adapter caseProperty(Property object)
- {
- return createPropertyAdapter();
- }
- @Override
- public Adapter defaultCase(EObject object)
- {
- return createEObjectAdapter();
- }
- };
+ return createEObjectAdapter();
+ }
+ };
/**
* Creates an adapter for the <code>target</code>.
@@ -105,7 +114,6 @@ public class PreferencesAdapterFactory extends AdapterFactoryImpl
return modelSwitch.doSwitch((EObject)target);
}
-
/**
* Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.preferences.PreferenceNode <em>Preference Node</em>}'.
* <!-- begin-user-doc -->
@@ -149,4 +157,4 @@ public class PreferencesAdapterFactory extends AdapterFactoryImpl
return null;
}
-} //PreferencesAdapterFactory
+} // PreferencesAdapterFactory
diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/util/PreferencesSwitch.java b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/util/PreferencesSwitch.java
index c4de14a7f7..14f3e66c56 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/util/PreferencesSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/util/PreferencesSwitch.java
@@ -1,12 +1,21 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.preferences.util;
-import org.eclipse.emf.cdo.releng.preferences.*;
+import org.eclipse.emf.cdo.releng.preferences.PreferenceNode;
+import org.eclipse.emf.cdo.releng.preferences.PreferencesPackage;
+import org.eclipse.emf.cdo.releng.preferences.Property;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.util.Switch;
/**
@@ -72,21 +81,24 @@ public class PreferencesSwitch<T> extends Switch<T>
{
switch (classifierID)
{
- case PreferencesPackage.PREFERENCE_NODE:
- {
- PreferenceNode preferenceNode = (PreferenceNode)theEObject;
- T result = casePreferenceNode(preferenceNode);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case PreferencesPackage.PROPERTY:
- {
- Property property = (Property)theEObject;
- T result = caseProperty(property);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
+ case PreferencesPackage.PREFERENCE_NODE:
+ {
+ PreferenceNode preferenceNode = (PreferenceNode)theEObject;
+ T result = casePreferenceNode(preferenceNode);
+ if (result == null)
+ result = defaultCase(theEObject);
+ return result;
+ }
+ case PreferencesPackage.PROPERTY:
+ {
+ Property property = (Property)theEObject;
+ T result = caseProperty(property);
+ if (result == null)
+ result = defaultCase(theEObject);
+ return result;
+ }
+ default:
+ return defaultCase(theEObject);
}
}
@@ -139,4 +151,4 @@ public class PreferencesSwitch<T> extends Switch<T>
return null;
}
-} //PreferencesSwitch
+} // PreferencesSwitch
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/about.html b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/about.html
new file mode 100644
index 0000000000..d35d5aed64
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/build.properties b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/build.properties
index 6e3e902e80..928c49d837 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/build.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/build.properties
@@ -1,10 +1,23 @@
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
#
+# Contributors:
+# Eike Stepper - initial API and implementation
+
+# NLS_MESSAGEFORMAT_VAR
bin.includes = .,\
icons/,\
META-INF/,\
plugin.xml,\
- plugin.properties
+ plugin.properties,\
+ about.html,\
+ copyright.txt
jars.compile.order = .
source.. = src/
output.. = bin/
+src.includes = about.html,\
+ copyright.txt
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/copyright.txt b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/copyright.txt
new file mode 100644
index 0000000000..1c77978050
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/copyright.txt
@@ -0,0 +1,8 @@
+Copyright (c) 2004-2013 Eike Stepper (Berlin, Germany) and others.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+
+Contributors:
+ Eike Stepper - initial API and implementation
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/plugin.properties
index 53bbe57454..d3c127dce9 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/plugin.properties
@@ -1,7 +1,16 @@
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
#
+# Contributors:
+# Eike Stepper - initial API and implementation
-pluginName = Project Config Edit Support
-providerName = www.example.org
+# NLS_MESSAGEFORMAT_VAR
+
+pluginName = Project Configuration Edit Support
+providerName = Eclipse Modeling Project
_UI_CreateChild_text = {0}
_UI_CreateChild_text2 = {1} {0}
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/plugin.xml
index 2bdfb649a8..ff05d2af3f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/plugin.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
+<?eclipse version="3.4"?>
<!--
+ Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
-->
<plugin>
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/PreferenceFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/PreferenceFilterItemProvider.java
index b8d5db404b..8f7b0189a9 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/PreferenceFilterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/PreferenceFilterItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig.provider;
@@ -8,6 +16,7 @@ import org.eclipse.emf.cdo.releng.projectconfig.PreferenceFilter;
import org.eclipse.emf.cdo.releng.projectconfig.PreferenceProfile;
import org.eclipse.emf.cdo.releng.projectconfig.Project;
import org.eclipse.emf.cdo.releng.projectconfig.ProjectConfigPackage;
+
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.ResourceLocator;
@@ -25,6 +34,7 @@ import org.eclipse.emf.edit.provider.IWrapperItemProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -117,19 +127,13 @@ public class PreferenceFilterItemProvider extends ItemProviderAdapter implements
*/
protected void addInclusionsPropertyDescriptor(Object object)
{
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_PreferenceFilter_inclusions_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_PreferenceFilter_inclusions_feature", "_UI_PreferenceFilter_type"),
- ProjectConfigPackage.Literals.PREFERENCE_FILTER__INCLUSIONS,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(
+ ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_PreferenceFilter_inclusions_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_PreferenceFilter_inclusions_feature",
+ "_UI_PreferenceFilter_type"), ProjectConfigPackage.Literals.PREFERENCE_FILTER__INCLUSIONS, true, false,
+ false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -140,19 +144,13 @@ public class PreferenceFilterItemProvider extends ItemProviderAdapter implements
*/
protected void addExclusionsPropertyDescriptor(Object object)
{
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_PreferenceFilter_exclusions_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_PreferenceFilter_exclusions_feature", "_UI_PreferenceFilter_type"),
- ProjectConfigPackage.Literals.PREFERENCE_FILTER__EXCLUSIONS,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(
+ ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_PreferenceFilter_exclusions_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_PreferenceFilter_exclusions_feature",
+ "_UI_PreferenceFilter_type"), ProjectConfigPackage.Literals.PREFERENCE_FILTER__EXCLUSIONS, true, false,
+ false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/PreferenceProfileItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/PreferenceProfileItemProvider.java
index a0590036de..215265a94d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/PreferenceProfileItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/PreferenceProfileItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig.provider;
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/ProjectConfigEditPlugin.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/ProjectConfigEditPlugin.java
index bb918bb8ee..1b24ec6248 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/ProjectConfigEditPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/ProjectConfigEditPlugin.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig.provider;
@@ -6,7 +14,6 @@ import org.eclipse.emf.cdo.releng.predicates.provider.PredicatesEditPlugin;
import org.eclipse.emf.cdo.releng.preferences.provider.PreferencesEditPlugin;
import org.eclipse.emf.common.EMFPlugin;
-
import org.eclipse.emf.common.util.ResourceLocator;
/**
@@ -41,12 +48,7 @@ public final class ProjectConfigEditPlugin extends EMFPlugin
*/
public ProjectConfigEditPlugin()
{
- super
- (new ResourceLocator []
- {
- PredicatesEditPlugin.INSTANCE,
- PreferencesEditPlugin.INSTANCE,
- });
+ super(new ResourceLocator[] { PredicatesEditPlugin.INSTANCE, PreferencesEditPlugin.INSTANCE, });
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/ProjectConfigItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/ProjectConfigItemProviderAdapterFactory.java
index 3d142e6775..995095a436 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/ProjectConfigItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/ProjectConfigItemProviderAdapterFactory.java
@@ -1,16 +1,20 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig.provider;
-import java.util.ArrayList;
-import java.util.Collection;
-
import org.eclipse.emf.cdo.releng.projectconfig.util.ProjectConfigAdapterFactory;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.edit.provider.ChangeNotifier;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -24,6 +28,9 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import java.util.ArrayList;
+import java.util.Collection;
+
/**
* This is the factory that is used to provide the interfaces needed to support Viewers.
* The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
@@ -33,7 +40,8 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* <!-- end-user-doc -->
* @generated
*/
-public class ProjectConfigItemProviderAdapterFactory extends ProjectConfigAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
+public class ProjectConfigItemProviderAdapterFactory extends ProjectConfigAdapterFactory implements
+ ComposeableAdapterFactory, IChangeNotifier, IDisposable
{
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/ProjectItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/ProjectItemProvider.java
index 80fa34b245..fbc73be5eb 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/ProjectItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/ProjectItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig.provider;
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/WorkspaceConfigurationItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/WorkspaceConfigurationItemProvider.java
index b1e3f45d99..0cf0d0e9d4 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/WorkspaceConfigurationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.edit/src/org/eclipse/emf/cdo/releng/projectconfig/provider/WorkspaceConfigurationItemProvider.java
@@ -1,22 +1,23 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig.provider;
-
-import java.util.Collection;
-import java.util.List;
-
import org.eclipse.emf.cdo.releng.projectconfig.ProjectConfigFactory;
import org.eclipse.emf.cdo.releng.projectconfig.ProjectConfigPackage;
import org.eclipse.emf.cdo.releng.projectconfig.WorkspaceConfiguration;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -27,20 +28,17 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
+import java.util.Collection;
+import java.util.List;
+
/**
* This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.projectconfig.WorkspaceConfiguration} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
-public class WorkspaceConfigurationItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
+public class WorkspaceConfigurationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
* This constructs an instance from a factory and a notifier.
@@ -80,19 +78,14 @@ public class WorkspaceConfigurationItemProvider
*/
protected void addDefaultPreferenceNodePropertyDescriptor(Object object)
{
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_WorkspaceConfiguration_defaultPreferenceNode_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_WorkspaceConfiguration_defaultPreferenceNode_feature", "_UI_WorkspaceConfiguration_type"),
- ProjectConfigPackage.Literals.WORKSPACE_CONFIGURATION__DEFAULT_PREFERENCE_NODE,
- true,
- false,
- true,
- null,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(
+ ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_WorkspaceConfiguration_defaultPreferenceNode_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_WorkspaceConfiguration_defaultPreferenceNode_feature",
+ "_UI_WorkspaceConfiguration_type"),
+ ProjectConfigPackage.Literals.WORKSPACE_CONFIGURATION__DEFAULT_PREFERENCE_NODE, true, false, true, null, null,
+ null));
}
/**
@@ -103,19 +96,14 @@ public class WorkspaceConfigurationItemProvider
*/
protected void addInstancePreferenceNodePropertyDescriptor(Object object)
{
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_WorkspaceConfiguration_instancePreferenceNode_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_WorkspaceConfiguration_instancePreferenceNode_feature", "_UI_WorkspaceConfiguration_type"),
- ProjectConfigPackage.Literals.WORKSPACE_CONFIGURATION__INSTANCE_PREFERENCE_NODE,
- true,
- false,
- true,
- null,
- null,
- null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(
+ ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_WorkspaceConfiguration_instancePreferenceNode_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_WorkspaceConfiguration_instancePreferenceNode_feature",
+ "_UI_WorkspaceConfiguration_type"),
+ ProjectConfigPackage.Literals.WORKSPACE_CONFIGURATION__INSTANCE_PREFERENCE_NODE, true, false, true, null, null,
+ null));
}
/**
@@ -169,7 +157,7 @@ public class WorkspaceConfigurationItemProvider
* @generated
*/
@Override
- protected boolean shouldComposeCreationImage()
+ protected boolean shouldComposeCreationImage()
{
return true;
}
@@ -200,9 +188,9 @@ public class WorkspaceConfigurationItemProvider
switch (notification.getFeatureID(WorkspaceConfiguration.class))
{
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -219,10 +207,8 @@ public class WorkspaceConfigurationItemProvider
{
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (ProjectConfigPackage.Literals.WORKSPACE_CONFIGURATION__PROJECTS,
- ProjectConfigFactory.eINSTANCE.createProject()));
+ newChildDescriptors.add(createChildParameter(ProjectConfigPackage.Literals.WORKSPACE_CONFIGURATION__PROJECTS,
+ ProjectConfigFactory.eINSTANCE.createProject()));
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/META-INF/MANIFEST.MF
index 64452148ae..4dde72a449 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/META-INF/MANIFEST.MF
@@ -20,5 +20,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.cdo.releng.preferences.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.cdo.releng.preferences.editor;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)"
+ org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.emf.cdo.releng.ui;bundle-version="[1.0.0,2.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/about.html b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/about.html
new file mode 100644
index 0000000000..d35d5aed64
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/build.properties b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/build.properties
index 5fb07711cf..e970acd6fa 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/build.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/build.properties
@@ -1,10 +1,23 @@
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
#
+# Contributors:
+# Eike Stepper - initial API and implementation
+
+# NLS_MESSAGEFORMAT_VAR
bin.includes = .,\
icons/,\
META-INF/,\
plugin.xml,\
- plugin.properties
+ plugin.properties,\
+ about.html,\
+ copyright.txt
jars.compile.order = .
source.. = src/
output.. = bin
+src.includes = about.html,\
+ copyright.txt
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/copyright.txt b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/copyright.txt
new file mode 100644
index 0000000000..1c77978050
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/copyright.txt
@@ -0,0 +1,8 @@
+Copyright (c) 2004-2013 Eike Stepper (Berlin, Germany) and others.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+
+Contributors:
+ Eike Stepper - initial API and implementation
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/plugin.properties
index 6ee1bb7596..3ef281c1dc 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/plugin.properties
@@ -1,7 +1,16 @@
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
#
+# Contributors:
+# Eike Stepper - initial API and implementation
-pluginName = Project Config Editor
-providerName = www.example.org
+# NLS_MESSAGEFORMAT_VAR
+
+pluginName = Project Configuration Editor
+providerName = Eclipse Modeling Project
_UI_ProjectConfigEditor_menu = &ProjectConfig Editor
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/plugin.xml
index 9c716de42a..bf0d821181 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/plugin.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
+<?eclipse version="3.4"?>
<!--
+ Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
-->
<plugin>
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigActionBarContributor.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigActionBarContributor.java
index c50d7f0ca1..9e88195f2a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigActionBarContributor.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig.presentation;
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigEditor.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigEditor.java
index 90ecbd80d3..52ce6d60c5 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigEditor.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigEditor.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig.presentation;
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigEditorPlugin.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigEditorPlugin.java
index c0be5c5587..0260e3be44 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigEditorPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigEditorPlugin.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig.presentation;
@@ -6,9 +14,7 @@ import org.eclipse.emf.cdo.releng.predicates.provider.PredicatesEditPlugin;
import org.eclipse.emf.cdo.releng.preferences.provider.PreferencesEditPlugin;
import org.eclipse.emf.common.EMFPlugin;
-
import org.eclipse.emf.common.ui.EclipseUIPlugin;
-
import org.eclipse.emf.common.util.ResourceLocator;
/**
@@ -26,7 +32,7 @@ public final class ProjectConfigEditorPlugin extends EMFPlugin
* @generated
*/
public static final ProjectConfigEditorPlugin INSTANCE = new ProjectConfigEditorPlugin();
-
+
/**
* Keep track of the singleton.
* <!-- begin-user-doc -->
@@ -43,12 +49,7 @@ public final class ProjectConfigEditorPlugin extends EMFPlugin
*/
public ProjectConfigEditorPlugin()
{
- super
- (new ResourceLocator []
- {
- PredicatesEditPlugin.INSTANCE,
- PreferencesEditPlugin.INSTANCE,
- });
+ super(new ResourceLocator[] { PredicatesEditPlugin.INSTANCE, PreferencesEditPlugin.INSTANCE, });
}
/**
@@ -63,7 +64,7 @@ public final class ProjectConfigEditorPlugin extends EMFPlugin
{
return plugin;
}
-
+
/**
* Returns the singleton instance of the Eclipse plugin.
* <!-- begin-user-doc -->
@@ -75,7 +76,7 @@ public final class ProjectConfigEditorPlugin extends EMFPlugin
{
return plugin;
}
-
+
/**
* The actual implementation of the Eclipse <b>Plugin</b>.
* <!-- begin-user-doc -->
@@ -93,7 +94,7 @@ public final class ProjectConfigEditorPlugin extends EMFPlugin
public Implementation()
{
super();
-
+
// Remember the static instance.
//
plugin = this;
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigPreferencePage.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigPreferencePage.java
index d557383bf8..105f863845 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigPreferencePage.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/ProjectConfigPreferencePage.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/handlers/ApplyPreferenceProfilesHandler.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/handlers/ApplyPreferenceProfilesHandler.java
index 75cf14ebf2..2f26d54806 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/handlers/ApplyPreferenceProfilesHandler.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/handlers/ApplyPreferenceProfilesHandler.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ */
package org.eclipse.emf.cdo.releng.projectconfig.presentation.handlers;
import org.eclipse.emf.cdo.releng.projectconfig.util.ProjectConfigUtil;
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/handlers/NavigateHandler.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/handlers/NavigateHandler.java
index 89553e6ee1..2808bff00d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/handlers/NavigateHandler.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig.editor/src/org/eclipse/emf/cdo/releng/projectconfig/presentation/handlers/NavigateHandler.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ */
package org.eclipse.emf.cdo.releng.projectconfig.presentation.handlers;
import org.eclipse.emf.cdo.releng.preferences.PreferenceNode;
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/about.properties b/plugins/org.eclipse.emf.cdo.releng.projectconfig/about.properties
index 9134ef220b..be2f377d45 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/about.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/about.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -16,16 +16,8 @@
# append it to the end of the file, and change the code to use the new name.
# ==============================================================================
-featureName = CDO Release Engineering Dynamic Working Sets
-featureText = CDO Release Engineering Dynamic Working Sets\n\
+featureName = Project Configuration
+featureText = Project Configuration\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-Copyright (c) 2004-2013 Eike Stepper (Berlin, Germany) and others. All rights reserved.\n\
-\n\
-Visit http://www.eclipse.org/cdo
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/build.properties b/plugins/org.eclipse.emf.cdo.releng.projectconfig/build.properties
index eb09361899..a85815f30a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/build.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/build.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.projectconfig/plugin.properties
index 784abf50af..39179a8515 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/plugin.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -7,7 +7,7 @@
# Contributors:
# Eike Stepper - initial API and implementation
-pluginName = CDO Release Engineering Dynamic Working Sets
+pluginName = Project Configuration
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.projectconfig/plugin.xml
index 9a58ea67fe..f89309adba 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/plugin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<!--
- Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+ Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/PreferenceFilter.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/PreferenceFilter.java
index 2faf5cad1a..dcab717d51 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/PreferenceFilter.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/PreferenceFilter.java
@@ -1,11 +1,21 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig;
-import java.util.regex.Pattern;
import org.eclipse.emf.cdo.releng.preferences.PreferenceNode;
+
import org.eclipse.emf.ecore.EObject;
+import java.util.regex.Pattern;
+
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Preference Filter</b></em>'.
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/PreferenceProfile.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/PreferenceProfile.java
index 9a6a109954..87e4507a8e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/PreferenceProfile.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/PreferenceProfile.java
@@ -1,10 +1,18 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig;
import org.eclipse.emf.cdo.releng.predicates.Predicate;
-import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
/**
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/Project.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/Project.java
index beeb7c4c70..10aacfc9af 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/Project.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/Project.java
@@ -1,11 +1,18 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig;
import org.eclipse.emf.cdo.releng.preferences.PreferenceNode;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
/**
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/ProjectConfigFactory.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/ProjectConfigFactory.java
index 4cef0abab1..b0610bf7c3 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/ProjectConfigFactory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/ProjectConfigFactory.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig;
@@ -67,4 +75,4 @@ public interface ProjectConfigFactory extends EFactory
*/
ProjectConfigPackage getProjectConfigPackage();
-} //ProjectConfigFactory
+} // ProjectConfigFactory
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/ProjectConfigPackage.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/ProjectConfigPackage.java
index 1b92bc04df..28e193fb45 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/ProjectConfigPackage.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/ProjectConfigPackage.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig;
@@ -360,7 +368,6 @@ public interface ProjectConfigPackage extends EPackage
*/
int PREFERENCE_FILTER_OPERATION_COUNT = 1;
-
/**
* The meta object id for the '<em>Pattern</em>' data type.
* <!-- begin-user-doc -->
@@ -371,7 +378,6 @@ public interface ProjectConfigPackage extends EPackage
*/
int PATTERN = 4;
-
/**
* Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.projectconfig.WorkspaceConfiguration <em>Workspace Configuration</em>}'.
* <!-- begin-user-doc -->
@@ -698,7 +704,8 @@ public interface ProjectConfigPackage extends EPackage
* <!-- end-user-doc -->
* @generated
*/
- EReference WORKSPACE_CONFIGURATION__DEFAULT_PREFERENCE_NODE = eINSTANCE.getWorkspaceConfiguration_DefaultPreferenceNode();
+ EReference WORKSPACE_CONFIGURATION__DEFAULT_PREFERENCE_NODE = eINSTANCE
+ .getWorkspaceConfiguration_DefaultPreferenceNode();
/**
* The meta object literal for the '<em><b>Instance Preference Node</b></em>' reference feature.
@@ -706,7 +713,8 @@ public interface ProjectConfigPackage extends EPackage
* <!-- end-user-doc -->
* @generated
*/
- EReference WORKSPACE_CONFIGURATION__INSTANCE_PREFERENCE_NODE = eINSTANCE.getWorkspaceConfiguration_InstancePreferenceNode();
+ EReference WORKSPACE_CONFIGURATION__INSTANCE_PREFERENCE_NODE = eINSTANCE
+ .getWorkspaceConfiguration_InstancePreferenceNode();
/**
* The meta object literal for the '<em><b>Apply Preference Profiles</b></em>' operation.
@@ -714,7 +722,8 @@ public interface ProjectConfigPackage extends EPackage
* <!-- end-user-doc -->
* @generated
*/
- EOperation WORKSPACE_CONFIGURATION___APPLY_PREFERENCE_PROFILES = eINSTANCE.getWorkspaceConfiguration__ApplyPreferenceProfiles();
+ EOperation WORKSPACE_CONFIGURATION___APPLY_PREFERENCE_PROFILES = eINSTANCE
+ .getWorkspaceConfiguration__ApplyPreferenceProfiles();
/**
* The meta object literal for the '<em><b>Update Preference Profile References</b></em>' operation.
@@ -722,7 +731,8 @@ public interface ProjectConfigPackage extends EPackage
* <!-- end-user-doc -->
* @generated
*/
- EOperation WORKSPACE_CONFIGURATION___UPDATE_PREFERENCE_PROFILE_REFERENCES = eINSTANCE.getWorkspaceConfiguration__UpdatePreferenceProfileReferences();
+ EOperation WORKSPACE_CONFIGURATION___UPDATE_PREFERENCE_PROFILE_REFERENCES = eINSTANCE
+ .getWorkspaceConfiguration__UpdatePreferenceProfileReferences();
/**
* The meta object literal for the '{@link org.eclipse.emf.cdo.releng.projectconfig.impl.ProjectImpl <em>Project</em>}' class.
@@ -830,7 +840,8 @@ public interface ProjectConfigPackage extends EPackage
* <!-- end-user-doc -->
* @generated
*/
- EOperation PREFERENCE_PROFILE___REQUIRES__PREFERENCEPROFILE = eINSTANCE.getPreferenceProfile__Requires__PreferenceProfile();
+ EOperation PREFERENCE_PROFILE___REQUIRES__PREFERENCEPROFILE = eINSTANCE
+ .getPreferenceProfile__Requires__PreferenceProfile();
/**
* The meta object literal for the '{@link org.eclipse.emf.cdo.releng.projectconfig.impl.PreferenceFilterImpl <em>Preference Filter</em>}' class.
@@ -894,4 +905,4 @@ public interface ProjectConfigPackage extends EPackage
}
-} //ProjectConfigPackage
+} // ProjectConfigPackage
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/WorkspaceConfiguration.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/WorkspaceConfiguration.java
index f473506672..bc8f3b30c3 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/WorkspaceConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/WorkspaceConfiguration.java
@@ -1,11 +1,18 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig;
import org.eclipse.emf.cdo.releng.preferences.PreferenceNode;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
/**
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/PreferenceFilterImpl.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/PreferenceFilterImpl.java
index f147be70e8..eb346c4c01 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/PreferenceFilterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/PreferenceFilterImpl.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig.impl;
@@ -56,7 +64,8 @@ public class PreferenceFilterImpl extends MinimalEObjectImpl.Container implement
* @generated
* @ordered
*/
- protected static final Pattern INCLUSIONS_EDEFAULT = (Pattern)ProjectConfigFactory.eINSTANCE.createFromString(ProjectConfigPackage.eINSTANCE.getPattern(), ".*");
+ protected static final Pattern INCLUSIONS_EDEFAULT = (Pattern)ProjectConfigFactory.eINSTANCE.createFromString(
+ ProjectConfigPackage.eINSTANCE.getPattern(), ".*");
/**
* The cached value of the '{@link #getInclusions() <em>Inclusions</em>}' attribute.
@@ -76,7 +85,8 @@ public class PreferenceFilterImpl extends MinimalEObjectImpl.Container implement
* @generated
* @ordered
*/
- protected static final Pattern EXCLUSIONS_EDEFAULT = (Pattern)ProjectConfigFactory.eINSTANCE.createFromString(ProjectConfigPackage.eINSTANCE.getPattern(), "");
+ protected static final Pattern EXCLUSIONS_EDEFAULT = (Pattern)ProjectConfigFactory.eINSTANCE.createFromString(
+ ProjectConfigPackage.eINSTANCE.getPattern(), "");
/**
* The cached value of the '{@link #getExclusions() <em>Exclusions</em>}' attribute.
@@ -123,7 +133,8 @@ public class PreferenceFilterImpl extends MinimalEObjectImpl.Container implement
if (preferenceNode != oldPreferenceNode)
{
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_NODE, oldPreferenceNode, preferenceNode));
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_NODE, oldPreferenceNode, preferenceNode));
}
}
return preferenceNode;
@@ -149,7 +160,8 @@ public class PreferenceFilterImpl extends MinimalEObjectImpl.Container implement
PreferenceNode oldPreferenceNode = preferenceNode;
preferenceNode = newPreferenceNode;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_NODE, oldPreferenceNode, preferenceNode));
+ eNotify(new ENotificationImpl(this, Notification.SET, ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_NODE,
+ oldPreferenceNode, preferenceNode));
}
/**
@@ -159,7 +171,8 @@ public class PreferenceFilterImpl extends MinimalEObjectImpl.Container implement
*/
public PreferenceProfile getPreferenceProfile()
{
- if (eContainerFeatureID() != ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE) return null;
+ if (eContainerFeatureID() != ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE)
+ return null;
return (PreferenceProfile)eInternalContainer();
}
@@ -170,7 +183,8 @@ public class PreferenceFilterImpl extends MinimalEObjectImpl.Container implement
*/
public NotificationChain basicSetPreferenceProfile(PreferenceProfile newPreferenceProfile, NotificationChain msgs)
{
- msgs = eBasicSetContainer((InternalEObject)newPreferenceProfile, ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE, msgs);
+ msgs = eBasicSetContainer((InternalEObject)newPreferenceProfile,
+ ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE, msgs);
return msgs;
}
@@ -181,7 +195,8 @@ public class PreferenceFilterImpl extends MinimalEObjectImpl.Container implement
*/
public void setPreferenceProfile(PreferenceProfile newPreferenceProfile)
{
- if (newPreferenceProfile != eInternalContainer() || (eContainerFeatureID() != ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE && newPreferenceProfile != null))
+ if (newPreferenceProfile != eInternalContainer()
+ || (eContainerFeatureID() != ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE && newPreferenceProfile != null))
{
if (EcoreUtil.isAncestor(this, newPreferenceProfile))
throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
@@ -189,12 +204,15 @@ public class PreferenceFilterImpl extends MinimalEObjectImpl.Container implement
if (eInternalContainer() != null)
msgs = eBasicRemoveFromContainer(msgs);
if (newPreferenceProfile != null)
- msgs = ((InternalEObject)newPreferenceProfile).eInverseAdd(this, ProjectConfigPackage.PREFERENCE_PROFILE__PREFERENCE_FILTERS, PreferenceProfile.class, msgs);
+ msgs = ((InternalEObject)newPreferenceProfile).eInverseAdd(this,
+ ProjectConfigPackage.PREFERENCE_PROFILE__PREFERENCE_FILTERS, PreferenceProfile.class, msgs);
msgs = basicSetPreferenceProfile(newPreferenceProfile, msgs);
- if (msgs != null) msgs.dispatch();
+ if (msgs != null)
+ msgs.dispatch();
}
else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE, newPreferenceProfile, newPreferenceProfile));
+ eNotify(new ENotificationImpl(this, Notification.SET, ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE,
+ newPreferenceProfile, newPreferenceProfile));
}
/**
@@ -217,7 +235,8 @@ public class PreferenceFilterImpl extends MinimalEObjectImpl.Container implement
Pattern oldInclusions = inclusions;
inclusions = newInclusions;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ProjectConfigPackage.PREFERENCE_FILTER__INCLUSIONS, oldInclusions, inclusions));
+ eNotify(new ENotificationImpl(this, Notification.SET, ProjectConfigPackage.PREFERENCE_FILTER__INCLUSIONS,
+ oldInclusions, inclusions));
}
/**
@@ -240,7 +259,8 @@ public class PreferenceFilterImpl extends MinimalEObjectImpl.Container implement
Pattern oldExclusions = exclusions;
exclusions = newExclusions;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ProjectConfigPackage.PREFERENCE_FILTER__EXCLUSIONS, oldExclusions, exclusions));
+ eNotify(new ENotificationImpl(this, Notification.SET, ProjectConfigPackage.PREFERENCE_FILTER__EXCLUSIONS,
+ oldExclusions, exclusions));
}
/**
@@ -263,10 +283,10 @@ public class PreferenceFilterImpl extends MinimalEObjectImpl.Container implement
{
switch (featureID)
{
- case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE:
- if (eInternalContainer() != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return basicSetPreferenceProfile((PreferenceProfile)otherEnd, msgs);
+ case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE:
+ if (eInternalContainer() != null)
+ msgs = eBasicRemoveFromContainer(msgs);
+ return basicSetPreferenceProfile((PreferenceProfile)otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
@@ -281,8 +301,8 @@ public class PreferenceFilterImpl extends MinimalEObjectImpl.Container implement
{
switch (featureID)
{
- case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE:
- return basicSetPreferenceProfile(null, msgs);
+ case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE:
+ return basicSetPreferenceProfile(null, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -297,8 +317,9 @@ public class PreferenceFilterImpl extends MinimalEObjectImpl.Container implement
{
switch (eContainerFeatureID())
{
- case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE:
- return eInternalContainer().eInverseRemove(this, ProjectConfigPackage.PREFERENCE_PROFILE__PREFERENCE_FILTERS, PreferenceProfile.class, msgs);
+ case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE:
+ return eInternalContainer().eInverseRemove(this, ProjectConfigPackage.PREFERENCE_PROFILE__PREFERENCE_FILTERS,
+ PreferenceProfile.class, msgs);
}
return super.eBasicRemoveFromContainerFeature(msgs);
}
@@ -313,15 +334,16 @@ public class PreferenceFilterImpl extends MinimalEObjectImpl.Container implement
{
switch (featureID)
{
- case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_NODE:
- if (resolve) return getPreferenceNode();
- return basicGetPreferenceNode();
- case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE:
- return getPreferenceProfile();
- case ProjectConfigPackage.PREFERENCE_FILTER__INCLUSIONS:
- return getInclusions();
- case ProjectConfigPackage.PREFERENCE_FILTER__EXCLUSIONS:
- return getExclusions();
+ case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_NODE:
+ if (resolve)
+ return getPreferenceNode();
+ return basicGetPreferenceNode();
+ case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE:
+ return getPreferenceProfile();
+ case ProjectConfigPackage.PREFERENCE_FILTER__INCLUSIONS:
+ return getInclusions();
+ case ProjectConfigPackage.PREFERENCE_FILTER__EXCLUSIONS:
+ return getExclusions();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -336,18 +358,18 @@ public class PreferenceFilterImpl extends MinimalEObjectImpl.Container implement
{
switch (featureID)
{
- case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_NODE:
- setPreferenceNode((PreferenceNode)newValue);
- return;
- case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE:
- setPreferenceProfile((PreferenceProfile)newValue);
- return;
- case ProjectConfigPackage.PREFERENCE_FILTER__INCLUSIONS:
- setInclusions((Pattern)newValue);
- return;
- case ProjectConfigPackage.PREFERENCE_FILTER__EXCLUSIONS:
- setExclusions((Pattern)newValue);
- return;
+ case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_NODE:
+ setPreferenceNode((PreferenceNode)newValue);
+ return;
+ case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE:
+ setPreferenceProfile((PreferenceProfile)newValue);
+ return;
+ case ProjectConfigPackage.PREFERENCE_FILTER__INCLUSIONS:
+ setInclusions((Pattern)newValue);
+ return;
+ case ProjectConfigPackage.PREFERENCE_FILTER__EXCLUSIONS:
+ setExclusions((Pattern)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -362,18 +384,18 @@ public class PreferenceFilterImpl extends MinimalEObjectImpl.Container implement
{
switch (featureID)
{
- case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_NODE:
- setPreferenceNode((PreferenceNode)null);
- return;
- case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE:
- setPreferenceProfile((PreferenceProfile)null);
- return;
- case ProjectConfigPackage.PREFERENCE_FILTER__INCLUSIONS:
- setInclusions(INCLUSIONS_EDEFAULT);
- return;
- case ProjectConfigPackage.PREFERENCE_FILTER__EXCLUSIONS:
- setExclusions(EXCLUSIONS_EDEFAULT);
- return;
+ case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_NODE:
+ setPreferenceNode((PreferenceNode)null);
+ return;
+ case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE:
+ setPreferenceProfile((PreferenceProfile)null);
+ return;
+ case ProjectConfigPackage.PREFERENCE_FILTER__INCLUSIONS:
+ setInclusions(INCLUSIONS_EDEFAULT);
+ return;
+ case ProjectConfigPackage.PREFERENCE_FILTER__EXCLUSIONS:
+ setExclusions(EXCLUSIONS_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -388,14 +410,14 @@ public class PreferenceFilterImpl extends MinimalEObjectImpl.Container implement
{
switch (featureID)
{
- case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_NODE:
- return preferenceNode != null;
- case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE:
- return getPreferenceProfile() != null;
- case ProjectConfigPackage.PREFERENCE_FILTER__INCLUSIONS:
- return INCLUSIONS_EDEFAULT == null ? inclusions != null : !INCLUSIONS_EDEFAULT.equals(inclusions);
- case ProjectConfigPackage.PREFERENCE_FILTER__EXCLUSIONS:
- return EXCLUSIONS_EDEFAULT == null ? exclusions != null : !EXCLUSIONS_EDEFAULT.equals(exclusions);
+ case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_NODE:
+ return preferenceNode != null;
+ case ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE:
+ return getPreferenceProfile() != null;
+ case ProjectConfigPackage.PREFERENCE_FILTER__INCLUSIONS:
+ return INCLUSIONS_EDEFAULT == null ? inclusions != null : !INCLUSIONS_EDEFAULT.equals(inclusions);
+ case ProjectConfigPackage.PREFERENCE_FILTER__EXCLUSIONS:
+ return EXCLUSIONS_EDEFAULT == null ? exclusions != null : !EXCLUSIONS_EDEFAULT.equals(exclusions);
}
return super.eIsSet(featureID);
}
@@ -410,8 +432,8 @@ public class PreferenceFilterImpl extends MinimalEObjectImpl.Container implement
{
switch (operationID)
{
- case ProjectConfigPackage.PREFERENCE_FILTER___MATCHES__STRING:
- return matches((String)arguments.get(0));
+ case ProjectConfigPackage.PREFERENCE_FILTER___MATCHES__STRING:
+ return matches((String)arguments.get(0));
}
return super.eInvoke(operationID, arguments);
}
@@ -424,7 +446,8 @@ public class PreferenceFilterImpl extends MinimalEObjectImpl.Container implement
@Override
public String toString()
{
- if (eIsProxy()) return super.toString();
+ if (eIsProxy())
+ return super.toString();
StringBuffer result = new StringBuffer(super.toString());
result.append(" (inclusions: ");
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/PreferenceProfileImpl.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/PreferenceProfileImpl.java
index ea07f383be..af77c6b3b8 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/PreferenceProfileImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/PreferenceProfileImpl.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig.impl;
@@ -138,7 +146,9 @@ public class PreferenceProfileImpl extends MinimalEObjectImpl.Container implemen
{
if (preferenceFilters == null)
{
- preferenceFilters = new EObjectContainmentWithInverseEList<PreferenceFilter>(PreferenceFilter.class, this, ProjectConfigPackage.PREFERENCE_PROFILE__PREFERENCE_FILTERS, ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE);
+ preferenceFilters = new EObjectContainmentWithInverseEList<PreferenceFilter>(PreferenceFilter.class, this,
+ ProjectConfigPackage.PREFERENCE_PROFILE__PREFERENCE_FILTERS,
+ ProjectConfigPackage.PREFERENCE_FILTER__PREFERENCE_PROFILE);
}
return preferenceFilters;
}
@@ -152,7 +162,9 @@ public class PreferenceProfileImpl extends MinimalEObjectImpl.Container implemen
{
if (referentProjects == null)
{
- referentProjects = new EObjectWithInverseResolvingEList.ManyInverse<Project>(Project.class, this, ProjectConfigPackage.PREFERENCE_PROFILE__REFERENT_PROJECTS, ProjectConfigPackage.PROJECT__PREFERENCE_PROFILE_REFERENCES);
+ referentProjects = new EObjectWithInverseResolvingEList.ManyInverse<Project>(Project.class, this,
+ ProjectConfigPackage.PREFERENCE_PROFILE__REFERENT_PROJECTS,
+ ProjectConfigPackage.PROJECT__PREFERENCE_PROFILE_REFERENCES);
}
return referentProjects;
}
@@ -177,7 +189,8 @@ public class PreferenceProfileImpl extends MinimalEObjectImpl.Container implemen
String oldName = name;
name = newName;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ProjectConfigPackage.PREFERENCE_PROFILE__NAME, oldName, name));
+ eNotify(new ENotificationImpl(this, Notification.SET, ProjectConfigPackage.PREFERENCE_PROFILE__NAME, oldName,
+ name));
}
/**
@@ -187,7 +200,8 @@ public class PreferenceProfileImpl extends MinimalEObjectImpl.Container implemen
*/
public Project getProject()
{
- if (eContainerFeatureID() != ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT) return null;
+ if (eContainerFeatureID() != ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT)
+ return null;
return (Project)eInternalContainer();
}
@@ -209,7 +223,8 @@ public class PreferenceProfileImpl extends MinimalEObjectImpl.Container implemen
*/
public void setProject(Project newProject)
{
- if (newProject != eInternalContainer() || (eContainerFeatureID() != ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT && newProject != null))
+ if (newProject != eInternalContainer()
+ || (eContainerFeatureID() != ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT && newProject != null))
{
if (EcoreUtil.isAncestor(this, newProject))
throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
@@ -217,12 +232,15 @@ public class PreferenceProfileImpl extends MinimalEObjectImpl.Container implemen
if (eInternalContainer() != null)
msgs = eBasicRemoveFromContainer(msgs);
if (newProject != null)
- msgs = ((InternalEObject)newProject).eInverseAdd(this, ProjectConfigPackage.PROJECT__PREFERENCE_PROFILES, Project.class, msgs);
+ msgs = ((InternalEObject)newProject).eInverseAdd(this, ProjectConfigPackage.PROJECT__PREFERENCE_PROFILES,
+ Project.class, msgs);
msgs = basicSetProject(newProject, msgs);
- if (msgs != null) msgs.dispatch();
+ if (msgs != null)
+ msgs.dispatch();
}
else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT, newProject, newProject));
+ eNotify(new ENotificationImpl(this, Notification.SET, ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT,
+ newProject, newProject));
}
/**
@@ -234,7 +252,8 @@ public class PreferenceProfileImpl extends MinimalEObjectImpl.Container implemen
{
if (predicates == null)
{
- predicates = new EObjectContainmentEList<Predicate>(Predicate.class, this, ProjectConfigPackage.PREFERENCE_PROFILE__PREDICATES);
+ predicates = new EObjectContainmentEList<Predicate>(Predicate.class, this,
+ ProjectConfigPackage.PREFERENCE_PROFILE__PREDICATES);
}
return predicates;
}
@@ -248,7 +267,8 @@ public class PreferenceProfileImpl extends MinimalEObjectImpl.Container implemen
{
if (prerequisites == null)
{
- prerequisites = new EObjectResolvingEList<PreferenceProfile>(PreferenceProfile.class, this, ProjectConfigPackage.PREFERENCE_PROFILE__PREREQUISITES);
+ prerequisites = new EObjectResolvingEList<PreferenceProfile>(PreferenceProfile.class, this,
+ ProjectConfigPackage.PREFERENCE_PROFILE__PREREQUISITES);
}
return prerequisites;
}
@@ -291,14 +311,14 @@ public class PreferenceProfileImpl extends MinimalEObjectImpl.Container implemen
{
switch (featureID)
{
- case ProjectConfigPackage.PREFERENCE_PROFILE__PREFERENCE_FILTERS:
- return ((InternalEList<InternalEObject>)(InternalEList<?>)getPreferenceFilters()).basicAdd(otherEnd, msgs);
- case ProjectConfigPackage.PREFERENCE_PROFILE__REFERENT_PROJECTS:
- return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferentProjects()).basicAdd(otherEnd, msgs);
- case ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT:
- if (eInternalContainer() != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return basicSetProject((Project)otherEnd, msgs);
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PREFERENCE_FILTERS:
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getPreferenceFilters()).basicAdd(otherEnd, msgs);
+ case ProjectConfigPackage.PREFERENCE_PROFILE__REFERENT_PROJECTS:
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferentProjects()).basicAdd(otherEnd, msgs);
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT:
+ if (eInternalContainer() != null)
+ msgs = eBasicRemoveFromContainer(msgs);
+ return basicSetProject((Project)otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
@@ -313,14 +333,14 @@ public class PreferenceProfileImpl extends MinimalEObjectImpl.Container implemen
{
switch (featureID)
{
- case ProjectConfigPackage.PREFERENCE_PROFILE__PREFERENCE_FILTERS:
- return ((InternalEList<?>)getPreferenceFilters()).basicRemove(otherEnd, msgs);
- case ProjectConfigPackage.PREFERENCE_PROFILE__REFERENT_PROJECTS:
- return ((InternalEList<?>)getReferentProjects()).basicRemove(otherEnd, msgs);
- case ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT:
- return basicSetProject(null, msgs);
- case ProjectConfigPackage.PREFERENCE_PROFILE__PREDICATES:
- return ((InternalEList<?>)getPredicates()).basicRemove(otherEnd, msgs);
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PREFERENCE_FILTERS:
+ return ((InternalEList<?>)getPreferenceFilters()).basicRemove(otherEnd, msgs);
+ case ProjectConfigPackage.PREFERENCE_PROFILE__REFERENT_PROJECTS:
+ return ((InternalEList<?>)getReferentProjects()).basicRemove(otherEnd, msgs);
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT:
+ return basicSetProject(null, msgs);
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PREDICATES:
+ return ((InternalEList<?>)getPredicates()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -335,8 +355,9 @@ public class PreferenceProfileImpl extends MinimalEObjectImpl.Container implemen
{
switch (eContainerFeatureID())
{
- case ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT:
- return eInternalContainer().eInverseRemove(this, ProjectConfigPackage.PROJECT__PREFERENCE_PROFILES, Project.class, msgs);
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT:
+ return eInternalContainer().eInverseRemove(this, ProjectConfigPackage.PROJECT__PREFERENCE_PROFILES,
+ Project.class, msgs);
}
return super.eBasicRemoveFromContainerFeature(msgs);
}
@@ -351,18 +372,18 @@ public class PreferenceProfileImpl extends MinimalEObjectImpl.Container implemen
{
switch (featureID)
{
- case ProjectConfigPackage.PREFERENCE_PROFILE__PREFERENCE_FILTERS:
- return getPreferenceFilters();
- case ProjectConfigPackage.PREFERENCE_PROFILE__REFERENT_PROJECTS:
- return getReferentProjects();
- case ProjectConfigPackage.PREFERENCE_PROFILE__NAME:
- return getName();
- case ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT:
- return getProject();
- case ProjectConfigPackage.PREFERENCE_PROFILE__PREDICATES:
- return getPredicates();
- case ProjectConfigPackage.PREFERENCE_PROFILE__PREREQUISITES:
- return getPrerequisites();
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PREFERENCE_FILTERS:
+ return getPreferenceFilters();
+ case ProjectConfigPackage.PREFERENCE_PROFILE__REFERENT_PROJECTS:
+ return getReferentProjects();
+ case ProjectConfigPackage.PREFERENCE_PROFILE__NAME:
+ return getName();
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT:
+ return getProject();
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PREDICATES:
+ return getPredicates();
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PREREQUISITES:
+ return getPrerequisites();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -378,28 +399,28 @@ public class PreferenceProfileImpl extends MinimalEObjectImpl.Container implemen
{
switch (featureID)
{
- case ProjectConfigPackage.PREFERENCE_PROFILE__PREFERENCE_FILTERS:
- getPreferenceFilters().clear();
- getPreferenceFilters().addAll((Collection<? extends PreferenceFilter>)newValue);
- return;
- case ProjectConfigPackage.PREFERENCE_PROFILE__REFERENT_PROJECTS:
- getReferentProjects().clear();
- getReferentProjects().addAll((Collection<? extends Project>)newValue);
- return;
- case ProjectConfigPackage.PREFERENCE_PROFILE__NAME:
- setName((String)newValue);
- return;
- case ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT:
- setProject((Project)newValue);
- return;
- case ProjectConfigPackage.PREFERENCE_PROFILE__PREDICATES:
- getPredicates().clear();
- getPredicates().addAll((Collection<? extends Predicate>)newValue);
- return;
- case ProjectConfigPackage.PREFERENCE_PROFILE__PREREQUISITES:
- getPrerequisites().clear();
- getPrerequisites().addAll((Collection<? extends PreferenceProfile>)newValue);
- return;
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PREFERENCE_FILTERS:
+ getPreferenceFilters().clear();
+ getPreferenceFilters().addAll((Collection<? extends PreferenceFilter>)newValue);
+ return;
+ case ProjectConfigPackage.PREFERENCE_PROFILE__REFERENT_PROJECTS:
+ getReferentProjects().clear();
+ getReferentProjects().addAll((Collection<? extends Project>)newValue);
+ return;
+ case ProjectConfigPackage.PREFERENCE_PROFILE__NAME:
+ setName((String)newValue);
+ return;
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT:
+ setProject((Project)newValue);
+ return;
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PREDICATES:
+ getPredicates().clear();
+ getPredicates().addAll((Collection<? extends Predicate>)newValue);
+ return;
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PREREQUISITES:
+ getPrerequisites().clear();
+ getPrerequisites().addAll((Collection<? extends PreferenceProfile>)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -414,24 +435,24 @@ public class PreferenceProfileImpl extends MinimalEObjectImpl.Container implemen
{
switch (featureID)
{
- case ProjectConfigPackage.PREFERENCE_PROFILE__PREFERENCE_FILTERS:
- getPreferenceFilters().clear();
- return;
- case ProjectConfigPackage.PREFERENCE_PROFILE__REFERENT_PROJECTS:
- getReferentProjects().clear();
- return;
- case ProjectConfigPackage.PREFERENCE_PROFILE__NAME:
- setName(NAME_EDEFAULT);
- return;
- case ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT:
- setProject((Project)null);
- return;
- case ProjectConfigPackage.PREFERENCE_PROFILE__PREDICATES:
- getPredicates().clear();
- return;
- case ProjectConfigPackage.PREFERENCE_PROFILE__PREREQUISITES:
- getPrerequisites().clear();
- return;
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PREFERENCE_FILTERS:
+ getPreferenceFilters().clear();
+ return;
+ case ProjectConfigPackage.PREFERENCE_PROFILE__REFERENT_PROJECTS:
+ getReferentProjects().clear();
+ return;
+ case ProjectConfigPackage.PREFERENCE_PROFILE__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT:
+ setProject((Project)null);
+ return;
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PREDICATES:
+ getPredicates().clear();
+ return;
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PREREQUISITES:
+ getPrerequisites().clear();
+ return;
}
super.eUnset(featureID);
}
@@ -446,18 +467,18 @@ public class PreferenceProfileImpl extends MinimalEObjectImpl.Container implemen
{
switch (featureID)
{
- case ProjectConfigPackage.PREFERENCE_PROFILE__PREFERENCE_FILTERS:
- return preferenceFilters != null && !preferenceFilters.isEmpty();
- case ProjectConfigPackage.PREFERENCE_PROFILE__REFERENT_PROJECTS:
- return referentProjects != null && !referentProjects.isEmpty();
- case ProjectConfigPackage.PREFERENCE_PROFILE__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT:
- return getProject() != null;
- case ProjectConfigPackage.PREFERENCE_PROFILE__PREDICATES:
- return predicates != null && !predicates.isEmpty();
- case ProjectConfigPackage.PREFERENCE_PROFILE__PREREQUISITES:
- return prerequisites != null && !prerequisites.isEmpty();
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PREFERENCE_FILTERS:
+ return preferenceFilters != null && !preferenceFilters.isEmpty();
+ case ProjectConfigPackage.PREFERENCE_PROFILE__REFERENT_PROJECTS:
+ return referentProjects != null && !referentProjects.isEmpty();
+ case ProjectConfigPackage.PREFERENCE_PROFILE__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT:
+ return getProject() != null;
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PREDICATES:
+ return predicates != null && !predicates.isEmpty();
+ case ProjectConfigPackage.PREFERENCE_PROFILE__PREREQUISITES:
+ return prerequisites != null && !prerequisites.isEmpty();
}
return super.eIsSet(featureID);
}
@@ -472,8 +493,8 @@ public class PreferenceProfileImpl extends MinimalEObjectImpl.Container implemen
{
switch (operationID)
{
- case ProjectConfigPackage.PREFERENCE_PROFILE___REQUIRES__PREFERENCEPROFILE:
- return requires((PreferenceProfile)arguments.get(0));
+ case ProjectConfigPackage.PREFERENCE_PROFILE___REQUIRES__PREFERENCEPROFILE:
+ return requires((PreferenceProfile)arguments.get(0));
}
return super.eInvoke(operationID, arguments);
}
@@ -486,7 +507,8 @@ public class PreferenceProfileImpl extends MinimalEObjectImpl.Container implemen
@Override
public String toString()
{
- if (eIsProxy()) return super.toString();
+ if (eIsProxy())
+ return super.toString();
StringBuffer result = new StringBuffer(super.toString());
result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectConfigFactoryImpl.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectConfigFactoryImpl.java
index c5d526c2bb..cfda521efa 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectConfigFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectConfigFactoryImpl.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig.impl;
@@ -8,12 +16,14 @@ import org.eclipse.emf.cdo.releng.projectconfig.Project;
import org.eclipse.emf.cdo.releng.projectconfig.ProjectConfigFactory;
import org.eclipse.emf.cdo.releng.projectconfig.ProjectConfigPackage;
import org.eclipse.emf.cdo.releng.projectconfig.WorkspaceConfiguration;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.EFactoryImpl;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
import java.util.regex.Pattern;
/**
@@ -34,7 +44,8 @@ public class ProjectConfigFactoryImpl extends EFactoryImpl implements ProjectCon
{
try
{
- ProjectConfigFactory theProjectConfigFactory = (ProjectConfigFactory)EPackage.Registry.INSTANCE.getEFactory(ProjectConfigPackage.eNS_URI);
+ ProjectConfigFactory theProjectConfigFactory = (ProjectConfigFactory)EPackage.Registry.INSTANCE
+ .getEFactory(ProjectConfigPackage.eNS_URI);
if (theProjectConfigFactory != null)
{
return theProjectConfigFactory;
@@ -68,12 +79,16 @@ public class ProjectConfigFactoryImpl extends EFactoryImpl implements ProjectCon
{
switch (eClass.getClassifierID())
{
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION: return createWorkspaceConfiguration();
- case ProjectConfigPackage.PROJECT: return createProject();
- case ProjectConfigPackage.PREFERENCE_PROFILE: return createPreferenceProfile();
- case ProjectConfigPackage.PREFERENCE_FILTER: return createPreferenceFilter();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION:
+ return createWorkspaceConfiguration();
+ case ProjectConfigPackage.PROJECT:
+ return createProject();
+ case ProjectConfigPackage.PREFERENCE_PROFILE:
+ return createPreferenceProfile();
+ case ProjectConfigPackage.PREFERENCE_FILTER:
+ return createPreferenceFilter();
+ default:
+ throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
}
@@ -87,10 +102,10 @@ public class ProjectConfigFactoryImpl extends EFactoryImpl implements ProjectCon
{
switch (eDataType.getClassifierID())
{
- case ProjectConfigPackage.PATTERN:
- return createPatternFromString(eDataType, initialValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+ case ProjectConfigPackage.PATTERN:
+ return createPatternFromString(eDataType, initialValue);
+ default:
+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
}
@@ -104,10 +119,10 @@ public class ProjectConfigFactoryImpl extends EFactoryImpl implements ProjectCon
{
switch (eDataType.getClassifierID())
{
- case ProjectConfigPackage.PATTERN:
- return convertPatternToString(eDataType, instanceValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+ case ProjectConfigPackage.PATTERN:
+ return convertPatternToString(eDataType, instanceValue);
+ default:
+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
}
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectConfigPackageImpl.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectConfigPackageImpl.java
index d2139a7f74..9b46a38ebf 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectConfigPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectConfigPackageImpl.java
@@ -1,8 +1,15 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig.impl;
-import java.util.regex.Pattern;
import org.eclipse.emf.cdo.releng.predicates.PredicatesPackage;
import org.eclipse.emf.cdo.releng.preferences.PreferencesPackage;
import org.eclipse.emf.cdo.releng.projectconfig.PreferenceFilter;
@@ -12,6 +19,7 @@ import org.eclipse.emf.cdo.releng.projectconfig.ProjectConfigFactory;
import org.eclipse.emf.cdo.releng.projectconfig.ProjectConfigPackage;
import org.eclipse.emf.cdo.releng.projectconfig.WorkspaceConfiguration;
import org.eclipse.emf.cdo.releng.projectconfig.util.ProjectConfigValidator;
+
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
@@ -21,6 +29,8 @@ import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EValidator;
import org.eclipse.emf.ecore.impl.EPackageImpl;
+import java.util.regex.Pattern;
+
/**
* <!-- begin-user-doc -->
* An implementation of the model <b>Package</b>.
@@ -105,10 +115,13 @@ public class ProjectConfigPackageImpl extends EPackageImpl implements ProjectCon
*/
public static ProjectConfigPackage init()
{
- if (isInited) return (ProjectConfigPackage)EPackage.Registry.INSTANCE.getEPackage(ProjectConfigPackage.eNS_URI);
+ if (isInited)
+ return (ProjectConfigPackage)EPackage.Registry.INSTANCE.getEPackage(ProjectConfigPackage.eNS_URI);
// Obtain or create and register package
- ProjectConfigPackageImpl theProjectConfigPackage = (ProjectConfigPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ProjectConfigPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ProjectConfigPackageImpl());
+ ProjectConfigPackageImpl theProjectConfigPackage = (ProjectConfigPackageImpl)(EPackage.Registry.INSTANCE
+ .get(eNS_URI) instanceof ProjectConfigPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+ : new ProjectConfigPackageImpl());
isInited = true;
@@ -123,20 +136,17 @@ public class ProjectConfigPackageImpl extends EPackageImpl implements ProjectCon
theProjectConfigPackage.initializePackageContents();
// Register package validator
- EValidator.Registry.INSTANCE.put
- (theProjectConfigPackage,
- new EValidator.Descriptor()
- {
- public EValidator getEValidator()
- {
- return ProjectConfigValidator.INSTANCE;
- }
- });
+ EValidator.Registry.INSTANCE.put(theProjectConfigPackage, new EValidator.Descriptor()
+ {
+ public EValidator getEValidator()
+ {
+ return ProjectConfigValidator.INSTANCE;
+ }
+ });
// Mark meta-data to indicate it can't be changed
theProjectConfigPackage.freeze();
-
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(ProjectConfigPackage.eNS_URI, theProjectConfigPackage);
return theProjectConfigPackage;
@@ -428,7 +438,8 @@ public class ProjectConfigPackageImpl extends EPackageImpl implements ProjectCon
*/
public void createPackageContents()
{
- if (isCreated) return;
+ if (isCreated)
+ return;
isCreated = true;
// Create classes and their features
@@ -481,7 +492,8 @@ public class ProjectConfigPackageImpl extends EPackageImpl implements ProjectCon
*/
public void initializePackageContents()
{
- if (isInitialized) return;
+ if (isInitialized)
+ return;
isInitialized = true;
// Initialize package
@@ -490,8 +502,10 @@ public class ProjectConfigPackageImpl extends EPackageImpl implements ProjectCon
setNsURI(eNS_URI);
// Obtain other dependent packages
- PreferencesPackage thePreferencesPackage = (PreferencesPackage)EPackage.Registry.INSTANCE.getEPackage(PreferencesPackage.eNS_URI);
- PredicatesPackage thePredicatesPackage = (PredicatesPackage)EPackage.Registry.INSTANCE.getEPackage(PredicatesPackage.eNS_URI);
+ PreferencesPackage thePreferencesPackage = (PreferencesPackage)EPackage.Registry.INSTANCE
+ .getEPackage(PreferencesPackage.eNS_URI);
+ PredicatesPackage thePredicatesPackage = (PredicatesPackage)EPackage.Registry.INSTANCE
+ .getEPackage(PredicatesPackage.eNS_URI);
// Create type parameters
@@ -500,39 +514,83 @@ public class ProjectConfigPackageImpl extends EPackageImpl implements ProjectCon
// Add supertypes to classes
// Initialize classes, features, and operations; add parameters
- initEClass(workspaceConfigurationEClass, WorkspaceConfiguration.class, "WorkspaceConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getWorkspaceConfiguration_Projects(), this.getProject(), this.getProject_Configuration(), "projects", null, 0, -1, WorkspaceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getWorkspaceConfiguration_DefaultPreferenceNode(), thePreferencesPackage.getPreferenceNode(), null, "defaultPreferenceNode", null, 1, 1, WorkspaceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getWorkspaceConfiguration_InstancePreferenceNode(), thePreferencesPackage.getPreferenceNode(), null, "instancePreferenceNode", null, 1, 1, WorkspaceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEOperation(getWorkspaceConfiguration__ApplyPreferenceProfiles(), null, "applyPreferenceProfiles", 0, 1, IS_UNIQUE, IS_ORDERED);
-
- initEOperation(getWorkspaceConfiguration__UpdatePreferenceProfileReferences(), null, "updatePreferenceProfileReferences", 0, 1, IS_UNIQUE, IS_ORDERED);
+ initEClass(workspaceConfigurationEClass, WorkspaceConfiguration.class, "WorkspaceConfiguration", !IS_ABSTRACT,
+ !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getWorkspaceConfiguration_Projects(), this.getProject(), this.getProject_Configuration(),
+ "projects", null, 0, -1, WorkspaceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getWorkspaceConfiguration_DefaultPreferenceNode(), thePreferencesPackage.getPreferenceNode(), null,
+ "defaultPreferenceNode", null, 1, 1, WorkspaceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getWorkspaceConfiguration_InstancePreferenceNode(), thePreferencesPackage.getPreferenceNode(), null,
+ "instancePreferenceNode", null, 1, 1, WorkspaceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEOperation(getWorkspaceConfiguration__ApplyPreferenceProfiles(), null, "applyPreferenceProfiles", 0, 1,
+ IS_UNIQUE, IS_ORDERED);
+
+ initEOperation(getWorkspaceConfiguration__UpdatePreferenceProfileReferences(), null,
+ "updatePreferenceProfileReferences", 0, 1, IS_UNIQUE, IS_ORDERED);
initEClass(projectEClass, Project.class, "Project", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getProject_Configuration(), this.getWorkspaceConfiguration(), this.getWorkspaceConfiguration_Projects(), "configuration", null, 1, 1, Project.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getProject_PreferenceProfiles(), this.getPreferenceProfile(), this.getPreferenceProfile_Project(), "preferenceProfiles", null, 0, -1, Project.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getProject_PreferenceNode(), thePreferencesPackage.getPreferenceNode(), null, "preferenceNode", null, 1, 1, Project.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getProject_PreferenceProfileReferences(), this.getPreferenceProfile(), this.getPreferenceProfile_ReferentProjects(), "preferenceProfileReferences", null, 0, -1, Project.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(preferenceProfileEClass, PreferenceProfile.class, "PreferenceProfile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPreferenceProfile_PreferenceFilters(), this.getPreferenceFilter(), this.getPreferenceFilter_PreferenceProfile(), "preferenceFilters", null, 0, -1, PreferenceProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPreferenceProfile_ReferentProjects(), this.getProject(), this.getProject_PreferenceProfileReferences(), "referentProjects", null, 0, -1, PreferenceProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPreferenceProfile_Name(), ecorePackage.getEString(), "name", null, 1, 1, PreferenceProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPreferenceProfile_Project(), this.getProject(), this.getProject_PreferenceProfiles(), "project", null, 0, 1, PreferenceProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPreferenceProfile_Predicates(), thePredicatesPackage.getPredicate(), null, "predicates", null, 0, -1, PreferenceProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPreferenceProfile_Prerequisites(), this.getPreferenceProfile(), null, "prerequisites", null, 0, -1, PreferenceProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- EOperation op = initEOperation(getPreferenceProfile__Requires__PreferenceProfile(), ecorePackage.getEBoolean(), "requires", 0, 1, IS_UNIQUE, IS_ORDERED);
+ initEReference(getProject_Configuration(), this.getWorkspaceConfiguration(),
+ this.getWorkspaceConfiguration_Projects(), "configuration", null, 1, 1, Project.class, !IS_TRANSIENT,
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
+ initEReference(getProject_PreferenceProfiles(), this.getPreferenceProfile(), this.getPreferenceProfile_Project(),
+ "preferenceProfiles", null, 0, -1, Project.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+ !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getProject_PreferenceNode(), thePreferencesPackage.getPreferenceNode(), null, "preferenceNode",
+ null, 1, 1, Project.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getProject_PreferenceProfileReferences(), this.getPreferenceProfile(),
+ this.getPreferenceProfile_ReferentProjects(), "preferenceProfileReferences", null, 0, -1, Project.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+
+ initEClass(preferenceProfileEClass, PreferenceProfile.class, "PreferenceProfile", !IS_ABSTRACT, !IS_INTERFACE,
+ IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getPreferenceProfile_PreferenceFilters(), this.getPreferenceFilter(),
+ this.getPreferenceFilter_PreferenceProfile(), "preferenceFilters", null, 0, -1, PreferenceProfile.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getPreferenceProfile_ReferentProjects(), this.getProject(),
+ this.getProject_PreferenceProfileReferences(), "referentProjects", null, 0, -1, PreferenceProfile.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getPreferenceProfile_Name(), ecorePackage.getEString(), "name", null, 1, 1, PreferenceProfile.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getPreferenceProfile_Project(), this.getProject(), this.getProject_PreferenceProfiles(), "project",
+ null, 0, 1, PreferenceProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+ !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getPreferenceProfile_Predicates(), thePredicatesPackage.getPredicate(), null, "predicates", null, 0,
+ -1, PreferenceProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getPreferenceProfile_Prerequisites(), this.getPreferenceProfile(), null, "prerequisites", null, 0,
+ -1, PreferenceProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ EOperation op = initEOperation(getPreferenceProfile__Requires__PreferenceProfile(), ecorePackage.getEBoolean(),
+ "requires", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, this.getPreferenceProfile(), "preferenceProfile", 0, 1, IS_UNIQUE, IS_ORDERED);
- initEClass(preferenceFilterEClass, PreferenceFilter.class, "PreferenceFilter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPreferenceFilter_PreferenceNode(), thePreferencesPackage.getPreferenceNode(), null, "preferenceNode", null, 1, 1, PreferenceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPreferenceFilter_PreferenceProfile(), this.getPreferenceProfile(), this.getPreferenceProfile_PreferenceFilters(), "preferenceProfile", null, 1, 1, PreferenceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPreferenceFilter_Inclusions(), this.getPattern(), "inclusions", ".*", 1, 1, PreferenceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPreferenceFilter_Exclusions(), this.getPattern(), "exclusions", "", 1, 1, PreferenceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- op = initEOperation(getPreferenceFilter__Matches__String(), ecorePackage.getEBoolean(), "matches", 0, 1, IS_UNIQUE, IS_ORDERED);
+ initEClass(preferenceFilterEClass, PreferenceFilter.class, "PreferenceFilter", !IS_ABSTRACT, !IS_INTERFACE,
+ IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getPreferenceFilter_PreferenceNode(), thePreferencesPackage.getPreferenceNode(), null,
+ "preferenceNode", null, 1, 1, PreferenceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getPreferenceFilter_PreferenceProfile(), this.getPreferenceProfile(),
+ this.getPreferenceProfile_PreferenceFilters(), "preferenceProfile", null, 1, 1, PreferenceFilter.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getPreferenceFilter_Inclusions(), this.getPattern(), "inclusions", ".*", 1, 1,
+ PreferenceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getPreferenceFilter_Exclusions(), this.getPattern(), "exclusions", "", 1, 1, PreferenceFilter.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ op = initEOperation(getPreferenceFilter__Matches__String(), ecorePackage.getEBoolean(), "matches", 0, 1, IS_UNIQUE,
+ IS_ORDERED);
addEParameter(op, ecorePackage.getEString(), "value", 0, 1, IS_UNIQUE, IS_ORDERED);
// Initialize data types
@@ -554,14 +612,8 @@ public class ProjectConfigPackageImpl extends EPackageImpl implements ProjectCon
*/
protected void createEcoreAnnotations()
{
- String source = "http://www.eclipse.org/emf/2002/Ecore";
- addAnnotation
- (projectEClass,
- source,
- new String[]
- {
- "constraints", "AllPreferencesManaged"
- });
+ String source = "http://www.eclipse.org/emf/2002/Ecore";
+ addAnnotation(projectEClass, source, new String[] { "constraints", "AllPreferencesManaged" });
}
-} //ProjectConfigPackageImpl
+} // ProjectConfigPackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectConfigPlugin.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectConfigPlugin.java
index 2c9f0706cf..900b788d6c 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectConfigPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectConfigPlugin.java
@@ -1,9 +1,16 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig.impl;
import org.eclipse.emf.common.EMFPlugin;
-
import org.eclipse.emf.common.util.ResourceLocator;
/**
@@ -38,7 +45,7 @@ public final class ProjectConfigPlugin extends EMFPlugin
*/
public ProjectConfigPlugin()
{
- super(new ResourceLocator [] {});
+ super(new ResourceLocator[] {});
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectImpl.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectImpl.java
index 4ad8ad4f18..dd9b472e86 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/ProjectImpl.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig.impl;
@@ -101,7 +109,8 @@ public class ProjectImpl extends MinimalEObjectImpl.Container implements Project
*/
public WorkspaceConfiguration getConfiguration()
{
- if (eContainerFeatureID() != ProjectConfigPackage.PROJECT__CONFIGURATION) return null;
+ if (eContainerFeatureID() != ProjectConfigPackage.PROJECT__CONFIGURATION)
+ return null;
return (WorkspaceConfiguration)eInternalContainer();
}
@@ -123,7 +132,8 @@ public class ProjectImpl extends MinimalEObjectImpl.Container implements Project
*/
public void setConfiguration(WorkspaceConfiguration newConfiguration)
{
- if (newConfiguration != eInternalContainer() || (eContainerFeatureID() != ProjectConfigPackage.PROJECT__CONFIGURATION && newConfiguration != null))
+ if (newConfiguration != eInternalContainer()
+ || (eContainerFeatureID() != ProjectConfigPackage.PROJECT__CONFIGURATION && newConfiguration != null))
{
if (EcoreUtil.isAncestor(this, newConfiguration))
throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
@@ -131,12 +141,15 @@ public class ProjectImpl extends MinimalEObjectImpl.Container implements Project
if (eInternalContainer() != null)
msgs = eBasicRemoveFromContainer(msgs);
if (newConfiguration != null)
- msgs = ((InternalEObject)newConfiguration).eInverseAdd(this, ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS, WorkspaceConfiguration.class, msgs);
+ msgs = ((InternalEObject)newConfiguration).eInverseAdd(this,
+ ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS, WorkspaceConfiguration.class, msgs);
msgs = basicSetConfiguration(newConfiguration, msgs);
- if (msgs != null) msgs.dispatch();
+ if (msgs != null)
+ msgs.dispatch();
}
else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ProjectConfigPackage.PROJECT__CONFIGURATION, newConfiguration, newConfiguration));
+ eNotify(new ENotificationImpl(this, Notification.SET, ProjectConfigPackage.PROJECT__CONFIGURATION,
+ newConfiguration, newConfiguration));
}
/**
@@ -148,7 +161,8 @@ public class ProjectImpl extends MinimalEObjectImpl.Container implements Project
{
if (preferenceProfiles == null)
{
- preferenceProfiles = new EObjectContainmentWithInverseEList<PreferenceProfile>(PreferenceProfile.class, this, ProjectConfigPackage.PROJECT__PREFERENCE_PROFILES, ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT);
+ preferenceProfiles = new EObjectContainmentWithInverseEList<PreferenceProfile>(PreferenceProfile.class, this,
+ ProjectConfigPackage.PROJECT__PREFERENCE_PROFILES, ProjectConfigPackage.PREFERENCE_PROFILE__PROJECT);
}
return preferenceProfiles;
}
@@ -167,7 +181,8 @@ public class ProjectImpl extends MinimalEObjectImpl.Container implements Project
if (preferenceNode != oldPreferenceNode)
{
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, ProjectConfigPackage.PROJECT__PREFERENCE_NODE, oldPreferenceNode, preferenceNode));
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, ProjectConfigPackage.PROJECT__PREFERENCE_NODE,
+ oldPreferenceNode, preferenceNode));
}
}
return preferenceNode;
@@ -193,7 +208,8 @@ public class ProjectImpl extends MinimalEObjectImpl.Container implements Project
PreferenceNode oldPreferenceNode = preferenceNode;
preferenceNode = newPreferenceNode;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ProjectConfigPackage.PROJECT__PREFERENCE_NODE, oldPreferenceNode, preferenceNode));
+ eNotify(new ENotificationImpl(this, Notification.SET, ProjectConfigPackage.PROJECT__PREFERENCE_NODE,
+ oldPreferenceNode, preferenceNode));
}
/**
@@ -205,7 +221,9 @@ public class ProjectImpl extends MinimalEObjectImpl.Container implements Project
{
if (preferenceProfileReferences == null)
{
- preferenceProfileReferences = new EObjectWithInverseResolvingEList.ManyInverse<PreferenceProfile>(PreferenceProfile.class, this, ProjectConfigPackage.PROJECT__PREFERENCE_PROFILE_REFERENCES, ProjectConfigPackage.PREFERENCE_PROFILE__REFERENT_PROJECTS);
+ preferenceProfileReferences = new EObjectWithInverseResolvingEList.ManyInverse<PreferenceProfile>(
+ PreferenceProfile.class, this, ProjectConfigPackage.PROJECT__PREFERENCE_PROFILE_REFERENCES,
+ ProjectConfigPackage.PREFERENCE_PROFILE__REFERENT_PROJECTS);
}
return preferenceProfileReferences;
}
@@ -221,14 +239,15 @@ public class ProjectImpl extends MinimalEObjectImpl.Container implements Project
{
switch (featureID)
{
- case ProjectConfigPackage.PROJECT__CONFIGURATION:
- if (eInternalContainer() != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return basicSetConfiguration((WorkspaceConfiguration)otherEnd, msgs);
- case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILES:
- return ((InternalEList<InternalEObject>)(InternalEList<?>)getPreferenceProfiles()).basicAdd(otherEnd, msgs);
- case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILE_REFERENCES:
- return ((InternalEList<InternalEObject>)(InternalEList<?>)getPreferenceProfileReferences()).basicAdd(otherEnd, msgs);
+ case ProjectConfigPackage.PROJECT__CONFIGURATION:
+ if (eInternalContainer() != null)
+ msgs = eBasicRemoveFromContainer(msgs);
+ return basicSetConfiguration((WorkspaceConfiguration)otherEnd, msgs);
+ case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILES:
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getPreferenceProfiles()).basicAdd(otherEnd, msgs);
+ case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILE_REFERENCES:
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getPreferenceProfileReferences()).basicAdd(otherEnd,
+ msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
@@ -243,12 +262,12 @@ public class ProjectImpl extends MinimalEObjectImpl.Container implements Project
{
switch (featureID)
{
- case ProjectConfigPackage.PROJECT__CONFIGURATION:
- return basicSetConfiguration(null, msgs);
- case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILES:
- return ((InternalEList<?>)getPreferenceProfiles()).basicRemove(otherEnd, msgs);
- case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILE_REFERENCES:
- return ((InternalEList<?>)getPreferenceProfileReferences()).basicRemove(otherEnd, msgs);
+ case ProjectConfigPackage.PROJECT__CONFIGURATION:
+ return basicSetConfiguration(null, msgs);
+ case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILES:
+ return ((InternalEList<?>)getPreferenceProfiles()).basicRemove(otherEnd, msgs);
+ case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILE_REFERENCES:
+ return ((InternalEList<?>)getPreferenceProfileReferences()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -263,8 +282,9 @@ public class ProjectImpl extends MinimalEObjectImpl.Container implements Project
{
switch (eContainerFeatureID())
{
- case ProjectConfigPackage.PROJECT__CONFIGURATION:
- return eInternalContainer().eInverseRemove(this, ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS, WorkspaceConfiguration.class, msgs);
+ case ProjectConfigPackage.PROJECT__CONFIGURATION:
+ return eInternalContainer().eInverseRemove(this, ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS,
+ WorkspaceConfiguration.class, msgs);
}
return super.eBasicRemoveFromContainerFeature(msgs);
}
@@ -279,15 +299,16 @@ public class ProjectImpl extends MinimalEObjectImpl.Container implements Project
{
switch (featureID)
{
- case ProjectConfigPackage.PROJECT__CONFIGURATION:
- return getConfiguration();
- case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILES:
- return getPreferenceProfiles();
- case ProjectConfigPackage.PROJECT__PREFERENCE_NODE:
- if (resolve) return getPreferenceNode();
- return basicGetPreferenceNode();
- case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILE_REFERENCES:
- return getPreferenceProfileReferences();
+ case ProjectConfigPackage.PROJECT__CONFIGURATION:
+ return getConfiguration();
+ case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILES:
+ return getPreferenceProfiles();
+ case ProjectConfigPackage.PROJECT__PREFERENCE_NODE:
+ if (resolve)
+ return getPreferenceNode();
+ return basicGetPreferenceNode();
+ case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILE_REFERENCES:
+ return getPreferenceProfileReferences();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -303,20 +324,20 @@ public class ProjectImpl extends MinimalEObjectImpl.Container implements Project
{
switch (featureID)
{
- case ProjectConfigPackage.PROJECT__CONFIGURATION:
- setConfiguration((WorkspaceConfiguration)newValue);
- return;
- case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILES:
- getPreferenceProfiles().clear();
- getPreferenceProfiles().addAll((Collection<? extends PreferenceProfile>)newValue);
- return;
- case ProjectConfigPackage.PROJECT__PREFERENCE_NODE:
- setPreferenceNode((PreferenceNode)newValue);
- return;
- case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILE_REFERENCES:
- getPreferenceProfileReferences().clear();
- getPreferenceProfileReferences().addAll((Collection<? extends PreferenceProfile>)newValue);
- return;
+ case ProjectConfigPackage.PROJECT__CONFIGURATION:
+ setConfiguration((WorkspaceConfiguration)newValue);
+ return;
+ case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILES:
+ getPreferenceProfiles().clear();
+ getPreferenceProfiles().addAll((Collection<? extends PreferenceProfile>)newValue);
+ return;
+ case ProjectConfigPackage.PROJECT__PREFERENCE_NODE:
+ setPreferenceNode((PreferenceNode)newValue);
+ return;
+ case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILE_REFERENCES:
+ getPreferenceProfileReferences().clear();
+ getPreferenceProfileReferences().addAll((Collection<? extends PreferenceProfile>)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -331,18 +352,18 @@ public class ProjectImpl extends MinimalEObjectImpl.Container implements Project
{
switch (featureID)
{
- case ProjectConfigPackage.PROJECT__CONFIGURATION:
- setConfiguration((WorkspaceConfiguration)null);
- return;
- case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILES:
- getPreferenceProfiles().clear();
- return;
- case ProjectConfigPackage.PROJECT__PREFERENCE_NODE:
- setPreferenceNode((PreferenceNode)null);
- return;
- case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILE_REFERENCES:
- getPreferenceProfileReferences().clear();
- return;
+ case ProjectConfigPackage.PROJECT__CONFIGURATION:
+ setConfiguration((WorkspaceConfiguration)null);
+ return;
+ case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILES:
+ getPreferenceProfiles().clear();
+ return;
+ case ProjectConfigPackage.PROJECT__PREFERENCE_NODE:
+ setPreferenceNode((PreferenceNode)null);
+ return;
+ case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILE_REFERENCES:
+ getPreferenceProfileReferences().clear();
+ return;
}
super.eUnset(featureID);
}
@@ -357,14 +378,14 @@ public class ProjectImpl extends MinimalEObjectImpl.Container implements Project
{
switch (featureID)
{
- case ProjectConfigPackage.PROJECT__CONFIGURATION:
- return getConfiguration() != null;
- case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILES:
- return preferenceProfiles != null && !preferenceProfiles.isEmpty();
- case ProjectConfigPackage.PROJECT__PREFERENCE_NODE:
- return preferenceNode != null;
- case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILE_REFERENCES:
- return preferenceProfileReferences != null && !preferenceProfileReferences.isEmpty();
+ case ProjectConfigPackage.PROJECT__CONFIGURATION:
+ return getConfiguration() != null;
+ case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILES:
+ return preferenceProfiles != null && !preferenceProfiles.isEmpty();
+ case ProjectConfigPackage.PROJECT__PREFERENCE_NODE:
+ return preferenceNode != null;
+ case ProjectConfigPackage.PROJECT__PREFERENCE_PROFILE_REFERENCES:
+ return preferenceProfileReferences != null && !preferenceProfileReferences.isEmpty();
}
return super.eIsSet(featureID);
}
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/WorkspaceConfigurationImpl.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/WorkspaceConfigurationImpl.java
index 3004290775..25ee7a1c60 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/WorkspaceConfigurationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/impl/WorkspaceConfigurationImpl.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig.impl;
@@ -119,7 +127,8 @@ public class WorkspaceConfigurationImpl extends MinimalEObjectImpl.Container imp
{
if (projects == null)
{
- projects = new EObjectContainmentWithInverseEList<Project>(Project.class, this, ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS, ProjectConfigPackage.PROJECT__CONFIGURATION);
+ projects = new EObjectContainmentWithInverseEList<Project>(Project.class, this,
+ ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS, ProjectConfigPackage.PROJECT__CONFIGURATION);
}
return projects;
}
@@ -138,7 +147,9 @@ public class WorkspaceConfigurationImpl extends MinimalEObjectImpl.Container imp
if (defaultPreferenceNode != oldDefaultPreferenceNode)
{
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, ProjectConfigPackage.WORKSPACE_CONFIGURATION__DEFAULT_PREFERENCE_NODE, oldDefaultPreferenceNode, defaultPreferenceNode));
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ ProjectConfigPackage.WORKSPACE_CONFIGURATION__DEFAULT_PREFERENCE_NODE, oldDefaultPreferenceNode,
+ defaultPreferenceNode));
}
}
return defaultPreferenceNode;
@@ -164,7 +175,9 @@ public class WorkspaceConfigurationImpl extends MinimalEObjectImpl.Container imp
PreferenceNode oldDefaultPreferenceNode = defaultPreferenceNode;
defaultPreferenceNode = newDefaultPreferenceNode;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ProjectConfigPackage.WORKSPACE_CONFIGURATION__DEFAULT_PREFERENCE_NODE, oldDefaultPreferenceNode, defaultPreferenceNode));
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ ProjectConfigPackage.WORKSPACE_CONFIGURATION__DEFAULT_PREFERENCE_NODE, oldDefaultPreferenceNode,
+ defaultPreferenceNode));
}
/**
@@ -181,7 +194,9 @@ public class WorkspaceConfigurationImpl extends MinimalEObjectImpl.Container imp
if (instancePreferenceNode != oldInstancePreferenceNode)
{
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, ProjectConfigPackage.WORKSPACE_CONFIGURATION__INSTANCE_PREFERENCE_NODE, oldInstancePreferenceNode, instancePreferenceNode));
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ ProjectConfigPackage.WORKSPACE_CONFIGURATION__INSTANCE_PREFERENCE_NODE, oldInstancePreferenceNode,
+ instancePreferenceNode));
}
}
return instancePreferenceNode;
@@ -207,7 +222,9 @@ public class WorkspaceConfigurationImpl extends MinimalEObjectImpl.Container imp
PreferenceNode oldInstancePreferenceNode = instancePreferenceNode;
instancePreferenceNode = newInstancePreferenceNode;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ProjectConfigPackage.WORKSPACE_CONFIGURATION__INSTANCE_PREFERENCE_NODE, oldInstancePreferenceNode, instancePreferenceNode));
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ ProjectConfigPackage.WORKSPACE_CONFIGURATION__INSTANCE_PREFERENCE_NODE, oldInstancePreferenceNode,
+ instancePreferenceNode));
}
/**
@@ -356,8 +373,8 @@ public class WorkspaceConfigurationImpl extends MinimalEObjectImpl.Container imp
{
switch (featureID)
{
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS:
- return ((InternalEList<InternalEObject>)(InternalEList<?>)getProjects()).basicAdd(otherEnd, msgs);
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS:
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getProjects()).basicAdd(otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
@@ -372,8 +389,8 @@ public class WorkspaceConfigurationImpl extends MinimalEObjectImpl.Container imp
{
switch (featureID)
{
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS:
- return ((InternalEList<?>)getProjects()).basicRemove(otherEnd, msgs);
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS:
+ return ((InternalEList<?>)getProjects()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -388,14 +405,16 @@ public class WorkspaceConfigurationImpl extends MinimalEObjectImpl.Container imp
{
switch (featureID)
{
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS:
- return getProjects();
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION__DEFAULT_PREFERENCE_NODE:
- if (resolve) return getDefaultPreferenceNode();
- return basicGetDefaultPreferenceNode();
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION__INSTANCE_PREFERENCE_NODE:
- if (resolve) return getInstancePreferenceNode();
- return basicGetInstancePreferenceNode();
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS:
+ return getProjects();
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION__DEFAULT_PREFERENCE_NODE:
+ if (resolve)
+ return getDefaultPreferenceNode();
+ return basicGetDefaultPreferenceNode();
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION__INSTANCE_PREFERENCE_NODE:
+ if (resolve)
+ return getInstancePreferenceNode();
+ return basicGetInstancePreferenceNode();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -411,16 +430,16 @@ public class WorkspaceConfigurationImpl extends MinimalEObjectImpl.Container imp
{
switch (featureID)
{
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS:
- getProjects().clear();
- getProjects().addAll((Collection<? extends Project>)newValue);
- return;
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION__DEFAULT_PREFERENCE_NODE:
- setDefaultPreferenceNode((PreferenceNode)newValue);
- return;
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION__INSTANCE_PREFERENCE_NODE:
- setInstancePreferenceNode((PreferenceNode)newValue);
- return;
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS:
+ getProjects().clear();
+ getProjects().addAll((Collection<? extends Project>)newValue);
+ return;
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION__DEFAULT_PREFERENCE_NODE:
+ setDefaultPreferenceNode((PreferenceNode)newValue);
+ return;
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION__INSTANCE_PREFERENCE_NODE:
+ setInstancePreferenceNode((PreferenceNode)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -435,15 +454,15 @@ public class WorkspaceConfigurationImpl extends MinimalEObjectImpl.Container imp
{
switch (featureID)
{
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS:
- getProjects().clear();
- return;
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION__DEFAULT_PREFERENCE_NODE:
- setDefaultPreferenceNode((PreferenceNode)null);
- return;
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION__INSTANCE_PREFERENCE_NODE:
- setInstancePreferenceNode((PreferenceNode)null);
- return;
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS:
+ getProjects().clear();
+ return;
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION__DEFAULT_PREFERENCE_NODE:
+ setDefaultPreferenceNode((PreferenceNode)null);
+ return;
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION__INSTANCE_PREFERENCE_NODE:
+ setInstancePreferenceNode((PreferenceNode)null);
+ return;
}
super.eUnset(featureID);
}
@@ -458,12 +477,12 @@ public class WorkspaceConfigurationImpl extends MinimalEObjectImpl.Container imp
{
switch (featureID)
{
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS:
- return projects != null && !projects.isEmpty();
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION__DEFAULT_PREFERENCE_NODE:
- return defaultPreferenceNode != null;
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION__INSTANCE_PREFERENCE_NODE:
- return instancePreferenceNode != null;
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION__PROJECTS:
+ return projects != null && !projects.isEmpty();
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION__DEFAULT_PREFERENCE_NODE:
+ return defaultPreferenceNode != null;
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION__INSTANCE_PREFERENCE_NODE:
+ return instancePreferenceNode != null;
}
return super.eIsSet(featureID);
}
@@ -478,12 +497,12 @@ public class WorkspaceConfigurationImpl extends MinimalEObjectImpl.Container imp
{
switch (operationID)
{
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION___APPLY_PREFERENCE_PROFILES:
- applyPreferenceProfiles();
- return null;
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION___UPDATE_PREFERENCE_PROFILE_REFERENCES:
- updatePreferenceProfileReferences();
- return null;
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION___APPLY_PREFERENCE_PROFILES:
+ applyPreferenceProfiles();
+ return null;
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION___UPDATE_PREFERENCE_PROFILE_REFERENCES:
+ updatePreferenceProfileReferences();
+ return null;
}
return super.eInvoke(operationID, arguments);
}
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/util/ProjectConfigAdapterFactory.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/util/ProjectConfigAdapterFactory.java
index 53864c39b3..9b45934471 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/util/ProjectConfigAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/util/ProjectConfigAdapterFactory.java
@@ -1,14 +1,24 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig.util;
-import org.eclipse.emf.cdo.releng.projectconfig.*;
+import org.eclipse.emf.cdo.releng.projectconfig.PreferenceFilter;
+import org.eclipse.emf.cdo.releng.projectconfig.PreferenceProfile;
+import org.eclipse.emf.cdo.releng.projectconfig.Project;
+import org.eclipse.emf.cdo.releng.projectconfig.ProjectConfigPackage;
+import org.eclipse.emf.cdo.releng.projectconfig.WorkspaceConfiguration;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
/**
@@ -71,35 +81,38 @@ public class ProjectConfigAdapterFactory extends AdapterFactoryImpl
* <!-- end-user-doc -->
* @generated
*/
- protected ProjectConfigSwitch<Adapter> modelSwitch =
- new ProjectConfigSwitch<Adapter>()
+ protected ProjectConfigSwitch<Adapter> modelSwitch = new ProjectConfigSwitch<Adapter>()
+ {
+ @Override
+ public Adapter caseWorkspaceConfiguration(WorkspaceConfiguration object)
+ {
+ return createWorkspaceConfigurationAdapter();
+ }
+
+ @Override
+ public Adapter caseProject(Project object)
+ {
+ return createProjectAdapter();
+ }
+
+ @Override
+ public Adapter casePreferenceProfile(PreferenceProfile object)
{
- @Override
- public Adapter caseWorkspaceConfiguration(WorkspaceConfiguration object)
- {
- return createWorkspaceConfigurationAdapter();
- }
- @Override
- public Adapter caseProject(Project object)
- {
- return createProjectAdapter();
- }
- @Override
- public Adapter casePreferenceProfile(PreferenceProfile object)
- {
- return createPreferenceProfileAdapter();
- }
- @Override
- public Adapter casePreferenceFilter(PreferenceFilter object)
- {
- return createPreferenceFilterAdapter();
- }
- @Override
- public Adapter defaultCase(EObject object)
- {
- return createEObjectAdapter();
- }
- };
+ return createPreferenceProfileAdapter();
+ }
+
+ @Override
+ public Adapter casePreferenceFilter(PreferenceFilter object)
+ {
+ return createPreferenceFilterAdapter();
+ }
+
+ @Override
+ public Adapter defaultCase(EObject object)
+ {
+ return createEObjectAdapter();
+ }
+ };
/**
* Creates an adapter for the <code>target</code>.
@@ -115,7 +128,6 @@ public class ProjectConfigAdapterFactory extends AdapterFactoryImpl
return modelSwitch.doSwitch((EObject)target);
}
-
/**
* Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.projectconfig.WorkspaceConfiguration <em>Workspace Configuration</em>}'.
* <!-- begin-user-doc -->
@@ -189,4 +201,4 @@ public class ProjectConfigAdapterFactory extends AdapterFactoryImpl
return null;
}
-} //ProjectConfigAdapterFactory
+} // ProjectConfigAdapterFactory
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/util/ProjectConfigSwitch.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/util/ProjectConfigSwitch.java
index 682c554cd5..ed7b253ef1 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/util/ProjectConfigSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/util/ProjectConfigSwitch.java
@@ -1,12 +1,23 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig.util;
-import org.eclipse.emf.cdo.releng.projectconfig.*;
+import org.eclipse.emf.cdo.releng.projectconfig.PreferenceFilter;
+import org.eclipse.emf.cdo.releng.projectconfig.PreferenceProfile;
+import org.eclipse.emf.cdo.releng.projectconfig.Project;
+import org.eclipse.emf.cdo.releng.projectconfig.ProjectConfigPackage;
+import org.eclipse.emf.cdo.releng.projectconfig.WorkspaceConfiguration;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.util.Switch;
/**
@@ -72,35 +83,40 @@ public class ProjectConfigSwitch<T> extends Switch<T>
{
switch (classifierID)
{
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION:
- {
- WorkspaceConfiguration workspaceConfiguration = (WorkspaceConfiguration)theEObject;
- T result = caseWorkspaceConfiguration(workspaceConfiguration);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case ProjectConfigPackage.PROJECT:
- {
- Project project = (Project)theEObject;
- T result = caseProject(project);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case ProjectConfigPackage.PREFERENCE_PROFILE:
- {
- PreferenceProfile preferenceProfile = (PreferenceProfile)theEObject;
- T result = casePreferenceProfile(preferenceProfile);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case ProjectConfigPackage.PREFERENCE_FILTER:
- {
- PreferenceFilter preferenceFilter = (PreferenceFilter)theEObject;
- T result = casePreferenceFilter(preferenceFilter);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION:
+ {
+ WorkspaceConfiguration workspaceConfiguration = (WorkspaceConfiguration)theEObject;
+ T result = caseWorkspaceConfiguration(workspaceConfiguration);
+ if (result == null)
+ result = defaultCase(theEObject);
+ return result;
+ }
+ case ProjectConfigPackage.PROJECT:
+ {
+ Project project = (Project)theEObject;
+ T result = caseProject(project);
+ if (result == null)
+ result = defaultCase(theEObject);
+ return result;
+ }
+ case ProjectConfigPackage.PREFERENCE_PROFILE:
+ {
+ PreferenceProfile preferenceProfile = (PreferenceProfile)theEObject;
+ T result = casePreferenceProfile(preferenceProfile);
+ if (result == null)
+ result = defaultCase(theEObject);
+ return result;
+ }
+ case ProjectConfigPackage.PREFERENCE_FILTER:
+ {
+ PreferenceFilter preferenceFilter = (PreferenceFilter)theEObject;
+ T result = casePreferenceFilter(preferenceFilter);
+ if (result == null)
+ result = defaultCase(theEObject);
+ return result;
+ }
+ default:
+ return defaultCase(theEObject);
}
}
@@ -185,4 +201,4 @@ public class ProjectConfigSwitch<T> extends Switch<T>
return null;
}
-} //ProjectConfigSwitch
+} // ProjectConfigSwitch
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/util/ProjectConfigValidator.java b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/util/ProjectConfigValidator.java
index e88c76a58b..34a0952931 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/util/ProjectConfigValidator.java
+++ b/plugins/org.eclipse.emf.cdo.releng.projectconfig/src/org/eclipse/emf/cdo/releng/projectconfig/util/ProjectConfigValidator.java
@@ -1,15 +1,29 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.projectconfig.util;
import org.eclipse.emf.cdo.releng.preferences.PreferenceNode;
-import org.eclipse.emf.cdo.releng.projectconfig.*;
+import org.eclipse.emf.cdo.releng.projectconfig.PreferenceFilter;
+import org.eclipse.emf.cdo.releng.projectconfig.PreferenceProfile;
+import org.eclipse.emf.cdo.releng.projectconfig.Project;
+import org.eclipse.emf.cdo.releng.projectconfig.ProjectConfigPackage;
+import org.eclipse.emf.cdo.releng.projectconfig.WorkspaceConfiguration;
import org.eclipse.emf.cdo.releng.projectconfig.impl.ProjectConfigPlugin;
+
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.DiagnosticChain;
import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.EObjectValidator;
+
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -93,18 +107,18 @@ public class ProjectConfigValidator extends EObjectValidator
{
switch (classifierID)
{
- case ProjectConfigPackage.WORKSPACE_CONFIGURATION:
- return validateWorkspaceConfiguration((WorkspaceConfiguration)value, diagnostics, context);
- case ProjectConfigPackage.PROJECT:
- return validateProject((Project)value, diagnostics, context);
- case ProjectConfigPackage.PREFERENCE_PROFILE:
- return validatePreferenceProfile((PreferenceProfile)value, diagnostics, context);
- case ProjectConfigPackage.PREFERENCE_FILTER:
- return validatePreferenceFilter((PreferenceFilter)value, diagnostics, context);
- case ProjectConfigPackage.PATTERN:
- return validatePattern((Pattern)value, diagnostics, context);
- default:
- return true;
+ case ProjectConfigPackage.WORKSPACE_CONFIGURATION:
+ return validateWorkspaceConfiguration((WorkspaceConfiguration)value, diagnostics, context);
+ case ProjectConfigPackage.PROJECT:
+ return validateProject((Project)value, diagnostics, context);
+ case ProjectConfigPackage.PREFERENCE_PROFILE:
+ return validatePreferenceProfile((PreferenceProfile)value, diagnostics, context);
+ case ProjectConfigPackage.PREFERENCE_FILTER:
+ return validatePreferenceFilter((PreferenceFilter)value, diagnostics, context);
+ case ProjectConfigPackage.PATTERN:
+ return validatePattern((Pattern)value, diagnostics, context);
+ default:
+ return true;
}
}
@@ -126,16 +140,25 @@ public class ProjectConfigValidator extends EObjectValidator
*/
public boolean validateProject(Project project, DiagnosticChain diagnostics, Map<Object, Object> context)
{
- if (!validate_NoCircularContainment(project, diagnostics, context)) return false;
+ if (!validate_NoCircularContainment(project, diagnostics, context))
+ return false;
boolean result = validate_EveryMultiplicityConforms(project, diagnostics, context);
- if (result || diagnostics != null) result &= validate_EveryDataValueConforms(project, diagnostics, context);
- if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(project, diagnostics, context);
- if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(project, diagnostics, context);
- if (result || diagnostics != null) result &= validate_EveryProxyResolves(project, diagnostics, context);
- if (result || diagnostics != null) result &= validate_UniqueID(project, diagnostics, context);
- if (result || diagnostics != null) result &= validate_EveryKeyUnique(project, diagnostics, context);
- if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(project, diagnostics, context);
- if (result || diagnostics != null) result &= validateProject_AllPreferencesManaged(project, diagnostics, context);
+ if (result || diagnostics != null)
+ result &= validate_EveryDataValueConforms(project, diagnostics, context);
+ if (result || diagnostics != null)
+ result &= validate_EveryReferenceIsContained(project, diagnostics, context);
+ if (result || diagnostics != null)
+ result &= validate_EveryBidirectionalReferenceIsPaired(project, diagnostics, context);
+ if (result || diagnostics != null)
+ result &= validate_EveryProxyResolves(project, diagnostics, context);
+ if (result || diagnostics != null)
+ result &= validate_UniqueID(project, diagnostics, context);
+ if (result || diagnostics != null)
+ result &= validate_EveryKeyUnique(project, diagnostics, context);
+ if (result || diagnostics != null)
+ result &= validate_EveryMapEntryUnique(project, diagnostics, context);
+ if (result || diagnostics != null)
+ result &= validateProject_AllPreferencesManaged(project, diagnostics, context);
return result;
}
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectcopy/about.properties b/plugins/org.eclipse.emf.cdo.releng.projectcopy/about.properties
index 28dc67dc16..c4305f062d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectcopy/about.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.projectcopy/about.properties
@@ -16,8 +16,8 @@
# append it to the end of the file, and change the code to use the new name.
# ==============================================================================
-featureName = CDO Release Engineering Project Copy
-featureText = CDO Release Engineering Project Copy\n\
+featureName = Project Copy
+featureText = Project Copy\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectcopy/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.projectcopy/plugin.properties
index 4fb5be16e5..5459242b84 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectcopy/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.projectcopy/plugin.properties
@@ -7,5 +7,5 @@
# Contributors:
# Eike Stepper - initial API and implementation
-pluginName = CDO Release Engineering Project Copy
+pluginName = Project Copy
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.cdo.releng.projectcopy/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.projectcopy/plugin.xml
index bff39b7f1f..7704c20c75 100644
--- a/plugins/org.eclipse.emf.cdo.releng.projectcopy/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.projectcopy/plugin.xml
@@ -21,7 +21,7 @@
objectClass="org.eclipse.core.resources.IProject">
<menu
id="org.eclipse.emf.cdo.releng"
- label="CDO Release Engineering"
+ label="Release Engineering"
path="additions">
<separator
name="group1">
diff --git a/plugins/org.eclipse.emf.cdo.releng.relativepaths/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.relativepaths/META-INF/MANIFEST.MF
index 5a275b96d2..52d6cc3363 100644
--- a/plugins/org.eclipse.emf.cdo.releng.relativepaths/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng.relativepaths/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.releng.relativepaths;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -12,4 +12,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.releng.relativepaths;version="1.0.100";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.releng.relativepaths;version="1.0.200";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.releng.relativepaths/about.properties b/plugins/org.eclipse.emf.cdo.releng.relativepaths/about.properties
index 218858ed28..afffebc91b 100644
--- a/plugins/org.eclipse.emf.cdo.releng.relativepaths/about.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.relativepaths/about.properties
@@ -16,8 +16,8 @@
# append it to the end of the file, and change the code to use the new name.
# ==============================================================================
-featureName = CDO Release Engineering Relative Paths
-featureText = CDO Release Engineering Relative Paths\n\
+featureName = Relative Paths
+featureText = Relative Paths\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
diff --git a/plugins/org.eclipse.emf.cdo.releng.relativepaths/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.relativepaths/plugin.properties
index 57204ed40b..a6b54aa43f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.relativepaths/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.relativepaths/plugin.properties
@@ -7,5 +7,5 @@
# Contributors:
# Eike Stepper - initial API and implementation
-pluginName = CDO Release Engineering Relative Paths
+pluginName = Relative Paths
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.cdo.releng.relativepaths/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.relativepaths/plugin.xml
index 11dc889cef..1459659c45 100644
--- a/plugins/org.eclipse.emf.cdo.releng.relativepaths/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.relativepaths/plugin.xml
@@ -21,7 +21,7 @@
objectClass="org.eclipse.core.resources.IResource">
<menu
id="org.eclipse.emf.cdo.releng"
- label="CDO Release Engineering"
+ label="Release Engineering"
path="additions">
<separator
name="group1">
diff --git a/plugins/org.eclipse.emf.cdo.releng.release/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.release/plugin.properties
index 400ab880f3..7663fab5f3 100644
--- a/plugins/org.eclipse.emf.cdo.releng.release/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.release/plugin.properties
@@ -7,5 +7,5 @@
# Contributors:
# Eike Stepper - initial API and implementation
-pluginName = CDO Release Engineering (Release Spec)
+pluginName = (Release Spec)
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ApiBaselineTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ApiBaselineTaskItemProvider.java
index 749cabcc57..b8f5b8072e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ApiBaselineTaskItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ApiBaselineTaskItemProvider.java
@@ -1,9 +1,18 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.provider;
import org.eclipse.emf.cdo.releng.setup.ApiBaselineTask;
import org.eclipse.emf.cdo.releng.setup.SetupPackage;
+
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
@@ -15,6 +24,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import java.util.Collection;
import java.util.List;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/BuckminsterImportTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/BuckminsterImportTaskItemProvider.java
index 4a82f656e9..0a577c1419 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/BuckminsterImportTaskItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/BuckminsterImportTaskItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.provider;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/CompoundSetupTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/CompoundSetupTaskItemProvider.java
index 33287c05df..79601cad8d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/CompoundSetupTaskItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/CompoundSetupTaskItemProvider.java
@@ -1,10 +1,19 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.provider;
import org.eclipse.emf.cdo.releng.setup.CompoundSetupTask;
import org.eclipse.emf.cdo.releng.setup.SetupFactory;
import org.eclipse.emf.cdo.releng.setup.SetupPackage;
+
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
@@ -17,6 +26,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import java.util.Collection;
import java.util.List;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ConfigurableItemItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ConfigurableItemItemProvider.java
index 8c88c25374..ac80af8149 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ConfigurableItemItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ConfigurableItemItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.provider;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipseIniTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipseIniTaskItemProvider.java
index 4b89965af9..4ef5fbdfb6 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipseIniTaskItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipseIniTaskItemProvider.java
@@ -1,10 +1,19 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.provider;
import org.eclipse.emf.cdo.releng.setup.EclipseIniTask;
import org.eclipse.emf.cdo.releng.setup.SetupPackage;
import org.eclipse.emf.cdo.releng.setup.impl.EclipseIniTaskImpl;
+
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
@@ -16,6 +25,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import java.util.Collection;
import java.util.List;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipsePreferenceTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipsePreferenceTaskItemProvider.java
index c05f2f4fe1..c7a1dd2dd7 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipsePreferenceTaskItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipsePreferenceTaskItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.provider;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipseVersionItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipseVersionItemProvider.java
index ec1c6ff5c4..144be04071 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipseVersionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipseVersionItemProvider.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.releng.setup.provider;
import org.eclipse.emf.cdo.releng.setup.EclipseVersion;
import org.eclipse.emf.cdo.releng.setup.SetupPackage;
+
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
@@ -23,6 +24,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import java.util.Collection;
import java.util.List;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/GitCloneTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/GitCloneTaskItemProvider.java
index e08efe55b4..ef383056a7 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/GitCloneTaskItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/GitCloneTaskItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.provider;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/LinkLocationTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/LinkLocationTaskItemProvider.java
index 078df0b8b2..d7cad03249 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/LinkLocationTaskItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/LinkLocationTaskItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.provider;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/OneTimeSetupTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/OneTimeSetupTaskItemProvider.java
index d0a42aa51d..89fe75443e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/OneTimeSetupTaskItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/OneTimeSetupTaskItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.provider;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/P2TaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/P2TaskItemProvider.java
index 0091048daf..9e4f937c2e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/P2TaskItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/P2TaskItemProvider.java
@@ -1,10 +1,19 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.provider;
import org.eclipse.emf.cdo.releng.setup.P2Task;
import org.eclipse.emf.cdo.releng.setup.SetupFactory;
import org.eclipse.emf.cdo.releng.setup.SetupPackage;
+
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
@@ -15,6 +24,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import java.util.Collection;
import java.util.List;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ResourceCopyTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ResourceCopyTaskItemProvider.java
index 5bf51eb602..c0e55926d9 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ResourceCopyTaskItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ResourceCopyTaskItemProvider.java
@@ -1,17 +1,21 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.provider;
-import java.util.Collection;
-import java.util.List;
-
import org.eclipse.emf.cdo.releng.setup.ResourceCopyTask;
import org.eclipse.emf.cdo.releng.setup.SetupPackage;
import org.eclipse.emf.cdo.releng.setup.SetupTaskScope;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -22,6 +26,9 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+import java.util.Collection;
+import java.util.List;
+
/**
* This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.ResourceCopyTask} object.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupTaskContainerItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupTaskContainerItemProvider.java
index 61b405bc40..ff94afb027 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupTaskContainerItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupTaskContainerItemProvider.java
@@ -1,10 +1,19 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.provider;
import org.eclipse.emf.cdo.releng.setup.SetupFactory;
import org.eclipse.emf.cdo.releng.setup.SetupPackage;
import org.eclipse.emf.cdo.releng.setup.SetupTaskContainer;
+
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.ResourceLocator;
@@ -18,6 +27,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
+
import java.util.Collection;
import java.util.List;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupTaskItemProvider.java
index 5cf6ac990b..e0a1a52ad1 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupTaskItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupTaskItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.provider;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/StringVariableTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/StringVariableTaskItemProvider.java
index 6607cd115c..980ee32f7f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/StringVariableTaskItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/StringVariableTaskItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.provider;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/TextModificationItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/TextModificationItemProvider.java
index 6c0a77f4ac..c6f2808607 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/TextModificationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/TextModificationItemProvider.java
@@ -1,18 +1,21 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.provider;
-import java.util.Collection;
-import java.util.List;
-
import org.eclipse.emf.cdo.releng.setup.SetupPackage;
import org.eclipse.emf.cdo.releng.setup.TextModification;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IChildCreationExtender;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
@@ -25,6 +28,9 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
+import java.util.Collection;
+import java.util.List;
+
/**
* This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.TextModification} object.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/TextModifyTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/TextModifyTaskItemProvider.java
index 2eb51ea017..181acdacd2 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/TextModifyTaskItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/TextModifyTaskItemProvider.java
@@ -1,10 +1,15 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.provider;
-import java.util.Collection;
-import java.util.List;
-
import org.eclipse.emf.cdo.releng.setup.SetupFactory;
import org.eclipse.emf.cdo.releng.setup.SetupPackage;
import org.eclipse.emf.cdo.releng.setup.SetupTaskScope;
@@ -12,9 +17,7 @@ import org.eclipse.emf.cdo.releng.setup.TextModifyTask;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -25,6 +28,9 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+import java.util.Collection;
+import java.util.List;
+
/**
* This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.TextModifyTask} object.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/WorkingSetTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/WorkingSetTaskItemProvider.java
index 049b66a57c..aeea9d1b19 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/WorkingSetTaskItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/WorkingSetTaskItemProvider.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.provider;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/about.html b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/about.html
new file mode 100644
index 0000000000..d35d5aed64
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/build.properties b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/build.properties
index 5fb07711cf..e970acd6fa 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/build.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/build.properties
@@ -1,10 +1,23 @@
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
#
+# Contributors:
+# Eike Stepper - initial API and implementation
+
+# NLS_MESSAGEFORMAT_VAR
bin.includes = .,\
icons/,\
META-INF/,\
plugin.xml,\
- plugin.properties
+ plugin.properties,\
+ about.html,\
+ copyright.txt
jars.compile.order = .
source.. = src/
output.. = bin
+src.includes = about.html,\
+ copyright.txt
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/copyright.txt b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/copyright.txt
new file mode 100644
index 0000000000..1c77978050
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/copyright.txt
@@ -0,0 +1,8 @@
+Copyright (c) 2004-2013 Eike Stepper (Berlin, Germany) and others.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+
+Contributors:
+ Eike Stepper - initial API and implementation
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/plugin.properties
index 4c54e71c8c..0f2d6e4786 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/plugin.properties
@@ -1,7 +1,16 @@
+# Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
#
+# Contributors:
+# Eike Stepper - initial API and implementation
-pluginName = Setup Editor
-providerName = www.example.org
+# NLS_MESSAGEFORMAT_VAR
+
+pluginName = Setup Development Environment Editor for RCP
+providerName = Eclipse Modeling Project
_UI_SetupEditor_menu = &Setup Editor
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/plugin.xml
index eec2e3682c..7d1defb7ae 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/plugin.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
+<?eclipse version="3.4"?>
<!--
+ Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - initial API and implementation
-->
<plugin>
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupActionBarContributor.java b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupActionBarContributor.java
index f6d8b374fb..2328f08f51 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupActionBarContributor.java
@@ -1,17 +1,19 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.rcp.presentation;
-import java.util.ArrayList;
-import java.util.Collection;
-
import org.eclipse.emf.common.ui.action.WorkbenchWindowActionDelegate;
-
import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-
import org.eclipse.emf.edit.ui.action.ControlAction;
import org.eclipse.emf.edit.ui.action.CreateChildAction;
import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
@@ -30,7 +32,6 @@ import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.action.SubContributionItem;
-
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
@@ -38,12 +39,13 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.Viewer;
-
import org.eclipse.jface.wizard.WizardDialog;
-
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
+import java.util.ArrayList;
+import java.util.Collection;
+
/**
* This is the action bar contributor for the Setup model editor.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditor.java b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditor.java
index b12a485d41..4c178d9c12 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditor.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditor.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.rcp.presentation;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditorAdvisor.java b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditorAdvisor.java
index 54536af5f4..dc90c75fe5 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditorAdvisor.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditorAdvisor.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.rcp.presentation;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditorPlugin.java b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditorPlugin.java
index 6d2d2218a6..4246f2bb08 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditorPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupEditorPlugin.java
@@ -1,13 +1,19 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.rcp.presentation;
import org.eclipse.emf.cdo.releng.workingsets.provider.WorkingSetsEditPlugin;
import org.eclipse.emf.common.EMFPlugin;
-
import org.eclipse.emf.common.ui.EclipseUIPlugin;
-
import org.eclipse.emf.common.util.ResourceLocator;
/**
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupModelWizard.java b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupModelWizard.java
index 5f24c79ef2..f427ca598a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupModelWizard.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.editor.rcp/src/org/eclipse/emf/cdo/releng/setup/rcp/presentation/SetupModelWizard.java
@@ -1,70 +1,60 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup.rcp.presentation;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.StringTokenizer;
+import org.eclipse.emf.cdo.releng.setup.SetupFactory;
+import org.eclipse.emf.cdo.releng.setup.SetupPackage;
+import org.eclipse.emf.cdo.releng.setup.provider.SetupEditPlugin;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClassifier;
-
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
-
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
-
import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
import org.eclipse.core.runtime.IProgressMonitor;
-
import org.eclipse.jface.dialogs.MessageDialog;
-
+import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.IStructuredSelection;
-
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
-
import org.eclipse.swt.SWT;
-
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.ModifyEvent;
-
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
-
+import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
-import org.eclipse.emf.cdo.releng.setup.SetupFactory;
-import org.eclipse.emf.cdo.releng.setup.SetupPackage;
-import org.eclipse.emf.cdo.releng.setup.provider.SetupEditPlugin;
-
import java.io.File;
-
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Text;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
/**
* This is a simple wizard for creating a new model file.
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/SetupEditorPlugin.java b/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/SetupEditorPlugin.java
index 910e8b8392..51798f574e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/SetupEditorPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/SetupEditorPlugin.java
@@ -10,6 +10,7 @@
*/
package org.eclipse.emf.cdo.releng.setup.presentation;
+import org.eclipse.emf.cdo.releng.predicates.provider.PredicatesEditPlugin;
import org.eclipse.emf.cdo.releng.workingsets.provider.WorkingSetsEditPlugin;
import org.eclipse.emf.common.EMFPlugin;
@@ -19,7 +20,6 @@ import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.cdo.releng.predicates.provider.PredicatesEditPlugin;
/**
* This is the central singleton for the Setup editor plugin.
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/actions/ManualPerformAction.java b/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/actions/ManualPerformAction.java
index f39153c097..0db82d6bc5 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/actions/ManualPerformAction.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/actions/ManualPerformAction.java
@@ -23,8 +23,6 @@ import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
import org.eclipse.ui.PlatformUI;
-import java.io.File;
-
/**
* @author Eike Stepper
*/
@@ -51,10 +49,9 @@ public class ManualPerformAction implements IWorkbenchWindowActionDelegate
try
{
final SetupTaskPerformer setupTaskPerformer = new SetupTaskPerformer(true);
- File logFile = new File(setupTaskPerformer.getInstallDir(), "setup.log");
IWorkbenchWindow window = PlatformUI.getWorkbench().getWorkbenchWindows()[0];
final Shell shell = window.getShell();
- ProgressLogDialog.run(shell, logFile, "Setting up IDE", new ProgressLogRunnable()
+ ProgressLogDialog.run(shell, "Setting up IDE", new ProgressLogRunnable()
{
public boolean run(ProgressLog log) throws Exception
{
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/Setup Dialog.launch b/plugins/org.eclipse.emf.cdo.releng.setup.product/Setup Dialog.launch
index 2a5a6b5979..be7cf4f08e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/Setup Dialog.launch
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.product/Setup Dialog.launch
@@ -22,7 +22,7 @@
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.mirrors=false -Declipse.p2.unsignedPolicy=allow -Xms1024m -Xmx2500m -Dreleng.url=file:/${workspace_loc}/org.eclipse.emf.cdo.releng.setup.update -Dsetup.uri=file://${resource_loc:/org.eclipse.emf.cdo.releng.setup/model/Configuration.setup}"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.mirrors=false -Declipse.p2.unsignedPolicy=allow -Xms1024m -Xmx2500m -Dreleng.urlx=file:/${workspace_loc}/org.eclipse.emf.cdo.releng.setup.update -Dsetup.urix=file://${resource_loc:/org.eclipse.emf.cdo.releng.setup/model/Configuration.setup}"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.emf.cdo.releng.setup.product.ide"/>
<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.xml@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.logging@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.setup.product/plugin.properties
index 15b9b38d4c..9e184f055d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.product/plugin.properties
@@ -7,7 +7,7 @@
# Contributors:
# Eike Stepper - initial API and implementation
-pluginName = CDO Release Engineering Setup Product
+pluginName = Setup Development Environment Product
providerName = Eclipse Modeling Project
product.description = A product for setting up development environments
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/SetupDialog.java b/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/SetupDialog.java
index 7a5d8230e1..bb67c78183 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/SetupDialog.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/SetupDialog.java
@@ -643,8 +643,7 @@ public class SetupDialog extends TitleAreaDialog
File folder = new File(installFolder);
folder.mkdirs();
- File logFile = new File(installFolder, "setup.log");
- ProgressLogDialog.run(getShell(), logFile, "Setting up IDE", new ProgressLogRunnable()
+ ProgressLogDialog.run(getShell(), "Setting up IDE", new ProgressLogRunnable()
{
public boolean run(ProgressLog log) throws Exception
{
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/Setup IDE.launch b/plugins/org.eclipse.emf.cdo.releng.setup/Setup IDE.launch
index 39c738d644..f75f83b665 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/Setup IDE.launch
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/Setup IDE.launch
@@ -6,8 +6,8 @@
<booleanAttribute key="automaticValidate" value="true"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Setup IDE"/>
<booleanAttribute key="default" value="false"/>
@@ -25,8 +25,8 @@
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.mirrors=false -Declipse.p2.unsignedPolicy=allow -Xms1024m -Xmx2500m -XX:MaxPermSize=512m&#13;&#10;-Dorg.eclipse.emf.cdo.releng.setup.ide=true&#13;&#10;&quot;-Djgit.gitprefix=C:\Program Files (x86)\Git&quot;&#13;&#10;-Dorg.eclipse.buckminster.core.bundle.pool=D:/sandbox/tmp8/.p2pool-tp"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,com.jcraft.jsch,javaewah,javax.annotation@default:default,javax.inject@default:default,javax.servlet,javax.xml@default:default,org.apache.ant,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.logging@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.lucene.analysis,org.apache.lucene.core,org.eclipse.ant.core@default:default,org.eclipse.ant.launching,org.eclipse.ant.ui,org.eclipse.buckminster.ant,org.eclipse.buckminster.cmdline,org.eclipse.buckminster.core,org.eclipse.buckminster.download,org.eclipse.buckminster.executor,org.eclipse.buckminster.fetcher,org.eclipse.buckminster.generic,org.eclipse.buckminster.generic.ui,org.eclipse.buckminster.git,org.eclipse.buckminster.installer,org.eclipse.buckminster.jarprocessor,org.eclipse.buckminster.jdt,org.eclipse.buckminster.junit,org.eclipse.buckminster.model.common,org.eclipse.buckminster.model.common.edit,org.eclipse.buckminster.mspec,org.eclipse.buckminster.mspec.edit,org.eclipse.buckminster.mspec.editor,org.eclipse.buckminster.osgi.filter,org.eclipse.buckminster.pde,org.eclipse.buckminster.pde.ui,org.eclipse.buckminster.rmap,org.eclipse.buckminster.rmap.edit,org.eclipse.buckminster.rmap.editor,org.eclipse.buckminster.rmap.pde,org.eclipse.buckminster.rmap.pde.edit,org.eclipse.buckminster.runtime,org.eclipse.buckminster.sax,org.eclipse.buckminster.ui,org.eclipse.compare,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools,org.eclipse.core.filebuffers,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.egit,org.eclipse.egit.core,org.eclipse.egit.fetchfactory,org.eclipse.egit.ui,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.servlet,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql,org.eclipse.equinox.p2.reconciler.dropins,org.eclipse.equinox.p2.repository.tools,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui,org.eclipse.equinox.p2.ui.importexport,org.eclipse.equinox.p2.ui.sdk,org.eclipse.equinox.p2.ui.sdk.scheduler,org.eclipse.equinox.p2.updatechecker,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help@default:default,org.eclipse.jdt,org.eclipse.jdt.compiler.apt,org.eclipse.jdt.compiler.tool,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.junit,org.eclipse.jdt.junit.core,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.ui,org.eclipse.jetty.continuation,org.eclipse.jetty.http,org.eclipse.jetty.io,org.eclipse.jetty.security,org.eclipse.jetty.server,org.eclipse.jetty.servlet,org.eclipse.jetty.util,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text,org.eclipse.jface@default:default,org.eclipse.jgit,org.eclipse.jsch.core,org.eclipse.jsch.ui,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde,org.eclipse.pde.api.tools,org.eclipse.pde.api.tools.ui,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.ds.core,org.eclipse.pde.ds.ui,org.eclipse.pde.junit.runtime,org.eclipse.pde.launching,org.eclipse.pde.runtime,org.eclipse.pde.ua.core,org.eclipse.pde.ua.ui,org.eclipse.pde.ui,org.eclipse.platform,org.eclipse.search,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui,org.eclipse.text,org.eclipse.ui.browser,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.ide.application,org.eclipse.ui.intro,org.eclipse.ui.intro.universal,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.net,org.eclipse.ui.trace,org.eclipse.ui.views.log,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.views@default:default,org.eclipse.ui.win32,org.eclipse.ui.workbench.texteditor,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator,org.hamcrest.core*1.1.0.v20090501071000,org.hamcrest.core*1.3.0.v201303031735,org.junit,org.objectweb.asm,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.cdo.releng.predicates.edit@default:default,org.eclipse.emf.cdo.releng.predicates@default:default,org.eclipse.emf.cdo.releng.preferences,org.eclipse.emf.cdo.releng.preferences.edit,org.eclipse.emf.cdo.releng.preferences.editor,org.eclipse.emf.cdo.releng.projectconfig,org.eclipse.emf.cdo.releng.projectconfig.edit,org.eclipse.emf.cdo.releng.projectconfig.editor,org.eclipse.emf.cdo.releng.setup.edit@default:default,org.eclipse.emf.cdo.releng.setup.editor,org.eclipse.emf.cdo.releng.setup@default:default,org.eclipse.emf.cdo.releng.ui,org.eclipse.emf.cdo.releng.workingsets.edit@default:default,org.eclipse.emf.cdo.releng.workingsets.editor,org.eclipse.emf.cdo.releng.workingsets@default:default,org.eclipse.net4j.util@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,com.jcraft.jsch@default:default,javaewah@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.logging@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.buckminster.ant@default:default,org.eclipse.buckminster.cmdline@default:default,org.eclipse.buckminster.core@default:default,org.eclipse.buckminster.download@default:default,org.eclipse.buckminster.executor@default:default,org.eclipse.buckminster.fetcher@default:default,org.eclipse.buckminster.generic.ui@default:default,org.eclipse.buckminster.generic@default:default,org.eclipse.buckminster.git@default:default,org.eclipse.buckminster.installer@default:default,org.eclipse.buckminster.jarprocessor@default:default,org.eclipse.buckminster.jdt@default:default,org.eclipse.buckminster.junit@default:default,org.eclipse.buckminster.model.common.edit@default:default,org.eclipse.buckminster.model.common@default:default,org.eclipse.buckminster.mspec.edit@default:default,org.eclipse.buckminster.mspec.editor@default:default,org.eclipse.buckminster.mspec@default:default,org.eclipse.buckminster.osgi.filter@default:default,org.eclipse.buckminster.pde.ui@default:default,org.eclipse.buckminster.pde@default:default,org.eclipse.buckminster.rmap.edit@default:default,org.eclipse.buckminster.rmap.editor@default:default,org.eclipse.buckminster.rmap.pde.edit@default:default,org.eclipse.buckminster.rmap.pde@default:default,org.eclipse.buckminster.rmap@default:default,org.eclipse.buckminster.runtime@default:default,org.eclipse.buckminster.sax@default:default,org.eclipse.buckminster.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.fetchfactory@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.hamcrest.core*1.1.0.v20090501071000@default:default,org.hamcrest.core*1.3.0.v201303031735@default:default,org.junit@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.cdo.releng.predicates.edit@default:default,org.eclipse.emf.cdo.releng.predicates@default:default,org.eclipse.emf.cdo.releng.preferences.edit@default:default,org.eclipse.emf.cdo.releng.preferences.editor@default:default,org.eclipse.emf.cdo.releng.preferences@default:default,org.eclipse.emf.cdo.releng.projectconfig.edit@default:default,org.eclipse.emf.cdo.releng.projectconfig.editor@default:default,org.eclipse.emf.cdo.releng.projectconfig@default:default,org.eclipse.emf.cdo.releng.setup.edit@default:default,org.eclipse.emf.cdo.releng.setup.editor@default:default,org.eclipse.emf.cdo.releng.setup@default:default,org.eclipse.emf.cdo.releng.ui@default:default,org.eclipse.emf.cdo.releng.workingsets.edit@default:default,org.eclipse.emf.cdo.releng.workingsets.editor@default:default,org.eclipse.emf.cdo.releng.workingsets@default:default,org.eclipse.net4j.util@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="false"/>
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/model/Configuration.setup b/plugins/org.eclipse.emf.cdo.releng.setup/model/Configuration.setup
index 1a7449a5e7..71d2d5c653 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/model/Configuration.setup
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/model/Configuration.setup
@@ -22,4 +22,14 @@
<setupTasks xsi:type="setup:EclipseIniTask" requirements="//@eclipseVersions.1/@setupTasks.0" option="--launcher.XXMaxPermSize" value="512m"/>
<setupTasks xsi:type="setup:EclipseIniTask" requirements="//@eclipseVersions.1/@setupTasks.0" option="-Dorg.eclipse.emf.cdo.releng.setup.ide" value="=true" vm="true"/>
</eclipseVersions>
+ <eclipseVersions version="4.4">
+ <setupTasks xsi:type="setup:P2Task">
+ <p2Repositories url="http://download.eclipse.org/releases/luna"/>
+ <p2Repositories url="${releng.url}"/>
+ <installableUnits id="org.eclipse.sdk.ide"/>
+ <installableUnits id="org.eclipse.emf.cdo.releng.setup.editor.feature.group"/>
+ </setupTasks>
+ <setupTasks xsi:type="setup:EclipseIniTask" requirements="//@eclipseVersions.2/@setupTasks.0" option="--launcher.XXMaxPermSize" value="512m"/>
+ <setupTasks xsi:type="setup:EclipseIniTask" requirements="//@eclipseVersions.2/@setupTasks.0" option="-Dorg.eclipse.emf.cdo.releng.setup.ide" value="=true" vm="true"/>
+ </eclipseVersions>
</setup:Configuration>
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/SetupTaskPerformer.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/SetupTaskPerformer.java
index 7b2d619d6e..af04607453 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/SetupTaskPerformer.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/SetupTaskPerformer.java
@@ -21,6 +21,8 @@ import org.eclipse.emf.cdo.releng.setup.util.OS;
import org.eclipse.emf.cdo.releng.setup.util.log.ProgressLog;
import org.eclipse.emf.cdo.releng.setup.util.log.ProgressLogRunnable;
+import org.eclipse.net4j.util.io.IOUtil;
+
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
@@ -30,15 +32,22 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
+import org.eclipse.emf.edit.EMFEditPlugin;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.PrintStream;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashSet;
@@ -57,6 +66,15 @@ public class SetupTaskPerformer extends HashMap<Object, Object> implements Setup
private static final String RELENG_URL = System.getProperty("releng.url",
"http://download.eclipse.org/modeling/emf/cdo/updates/integration").replace('\\', '/');
+ private static boolean NEEDS_PATH_SEPARATOR_CONVERSION = File.pathSeparatorChar == '\\';
+
+ private static final ComposedAdapterFactory ADAPTER_FACTORY = new ComposedAdapterFactory(
+ EMFEditPlugin.getComposedAdapterFactoryDescriptorRegistry());
+
+ private static final Pattern STRING_EXPANSION_PATTERN = Pattern.compile("\\$\\{([^${}|]+)(\\|([^}]+))?}");
+
+ private static final Map<String, StringFilter> STRING_FILTER_REGISTRY = new HashMap<String, StringFilter>();
+
private static final long serialVersionUID = 1L;
private static ProgressLog progress;
@@ -69,12 +87,13 @@ public class SetupTaskPerformer extends HashMap<Object, Object> implements Setup
private transient boolean restartNeeded;
+ private PrintStream logStream;
+
private List<String> logMessageBuffer;
public SetupTaskPerformer(File branchDir)
{
trigger = Trigger.BOOTSTRAP;
-
this.branchDir = branchDir;
initialize();
@@ -90,34 +109,6 @@ public class SetupTaskPerformer extends HashMap<Object, Object> implements Setup
initialize();
}
- private void initialize()
- {
- ResourceSet resourceSet = new ResourceSetImpl();
- resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("xmi", new XMIResourceFactoryImpl());
-
- URI uri = URI.createFileURI(branchDir.toString() + "/setup.xmi");
- Resource resource = resourceSet.getResource(uri, true);
-
- setup = (Setup)resource.getContents().get(0);
-
- Branch branch = setup.getBranch();
- String branchName = branch.getName();
-
- Project project = branch.getProject();
- String projectName = project.getName();
-
- put("setup.git.prefix", setup.getPreferences().getGitPrefix());
- put("setup.install.dir", getInstallDir());
- put("setup.project.dir", getProjectDir());
- put("setup.branch.dir", getBranchDir());
- put("setup.eclipse.dir", getEclipseDir());
- put("setup.tp.dir", getTargetPlatformDir());
- put("setup.ws.dir", getWorkspaceDir());
- put("setup.project.name", projectName);
- put("setup.branch.name", branchName);
- put("releng.url", RELENG_URL);
- }
-
public void dispose()
{
setup = null;
@@ -132,13 +123,13 @@ public class SetupTaskPerformer extends HashMap<Object, Object> implements Setup
{
for (String value : logMessageBuffer)
{
- progress.log(value);
+ doLog(value);
}
logMessageBuffer = null;
}
- progress.log(line);
+ doLog(line);
}
else
{
@@ -151,6 +142,29 @@ public class SetupTaskPerformer extends HashMap<Object, Object> implements Setup
}
}
+ private void doLog(String line)
+ {
+ if (logStream != null)
+ {
+ try
+ {
+ logStream.println("[" + ProgressLogDialog.DATE_TIME.format(new Date()) + "] " + line);
+ logStream.flush();
+ }
+ catch (Exception ex)
+ {
+ Activator.log(ex);
+ }
+ }
+
+ progress.log(line);
+ }
+
+ public void log(IStatus status)
+ {
+ log(ProgressLogDialog.toString(status));
+ }
+
public boolean isCancelled()
{
if (progress != null)
@@ -176,70 +190,27 @@ public class SetupTaskPerformer extends HashMap<Object, Object> implements Setup
restartNeeded = true;
}
- private static final Pattern PATTERN = Pattern.compile("\\$\\{([^${}|]+)(\\|([^}]+))?}");
-
- protected String lookup(String key)
- {
- Object object = get(key);
- if (object != null)
- {
- return object.toString();
- }
-
- return System.getProperty(key, key);
- }
-
- interface StringFilter
- {
- public String filter(String value);
- }
-
- private static final Map<String, StringFilter> FILTERS = new HashMap<String, StringFilter>();
-
- static
- {
- FILTERS.put("uri", new StringFilter()
- {
- public String filter(String value)
- {
- return URI.createFileURI(value).toString();
- }
- });
- FILTERS.put("upper", new StringFilter()
- {
- public String filter(String value)
- {
- return value.toUpperCase();
- }
- });
- FILTERS.put("lower", new StringFilter()
- {
- public String filter(String value)
- {
- return value.toLowerCase();
- }
- });
- }
-
- protected String filter(String value, String filterName)
- {
- StringFilter filter = FILTERS.get(filterName);
- if (filter != null)
- {
- return filter.filter(value);
- }
-
- return value;
- }
-
public String expandString(String string)
{
StringBuilder result = new StringBuilder();
int previous = 0;
- for (Matcher matcher = PATTERN.matcher(string); matcher.find();)
+ for (Matcher matcher = STRING_EXPANSION_PATTERN.matcher(string); matcher.find();)
{
result.append(string.substring(previous, matcher.start()));
String key = matcher.group(1);
+ String suffix = "";
+
+ int prefixIndex = key.indexOf('/');
+ if (prefixIndex != -1)
+ {
+ suffix = key.substring(prefixIndex);
+ key = key.substring(0, prefixIndex);
+ if (NEEDS_PATH_SEPARATOR_CONVERSION)
+ {
+ suffix = suffix.replace('/', File.pathSeparatorChar);
+ }
+ }
+
String value = lookup(key);
String filters = matcher.group(3);
if (filters != null)
@@ -249,9 +220,12 @@ public class SetupTaskPerformer extends HashMap<Object, Object> implements Setup
value = filter(value, filterName);
}
}
+
result.append(value);
+ result.append(suffix);
previous = matcher.end();
}
+
result.append(string.substring(previous));
return result.toString();
}
@@ -337,8 +311,77 @@ public class SetupTaskPerformer extends HashMap<Object, Object> implements Setup
setup = copySetup(setupTasks, substitutions);
reorder(setupTasks);
-
perform(setupTasks);
+
+ if (logStream != null)
+ {
+ logStream.println();
+ logStream.println();
+ logStream.println();
+ logStream.println();
+ IOUtil.closeSilent(logStream);
+ }
+ }
+
+ protected String lookup(String key)
+ {
+ Object object = get(key);
+ if (object != null)
+ {
+ return object.toString();
+ }
+
+ return System.getProperty(key, key);
+ }
+
+ protected String filter(String value, String filterName)
+ {
+ StringFilter filter = STRING_FILTER_REGISTRY.get(filterName);
+ if (filter != null)
+ {
+ return filter.filter(value);
+ }
+
+ return value;
+ }
+
+ private void initialize()
+ {
+ ResourceSet resourceSet = new ResourceSetImpl();
+ resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("xmi", new XMIResourceFactoryImpl());
+
+ URI uri = URI.createFileURI(branchDir.toString() + "/setup.xmi");
+ Resource resource = resourceSet.getResource(uri, true);
+
+ setup = (Setup)resource.getContents().get(0);
+
+ Branch branch = setup.getBranch();
+ String branchName = branch.getName();
+
+ Project project = branch.getProject();
+ String projectName = project.getName();
+
+ put("setup.git.prefix", setup.getPreferences().getGitPrefix());
+ put("setup.install.dir", getInstallDir());
+ put("setup.project.dir", getProjectDir());
+ put("setup.branch.dir", getBranchDir());
+ put("setup.eclipse.dir", getEclipseDir());
+ put("setup.tp.dir", getTargetPlatformDir());
+ put("setup.ws.dir", getWorkspaceDir());
+ put("setup.project.name", projectName);
+ put("setup.branch.name", branchName);
+ put("releng.url", RELENG_URL);
+
+ try
+ {
+ File logFile = new File(getBranchDir(), "setup.log");
+ logFile.getParentFile().mkdirs();
+ logStream = new PrintStream(new FileOutputStream(logFile, true));
+ }
+ catch (FileNotFoundException ex)
+ {
+ throw new RuntimeException(ex);
+ }
}
private void reorder(EList<SetupTask> setupTasks)
@@ -351,9 +394,8 @@ public class SetupTaskPerformer extends HashMap<Object, Object> implements Setup
throw new IllegalArgumentException("Circular requirements " + setupTask);
}
- EList<SetupTask> requirements = setupTask.getRequirements();
boolean changed = false;
- for (SetupTask requirement : requirements)
+ for (SetupTask requirement : setupTask.getRequirements())
{
int index = setupTasks.indexOf(requirement);
if (index > i)
@@ -385,10 +427,9 @@ public class SetupTaskPerformer extends HashMap<Object, Object> implements Setup
if (Activator.SETUP_IDE && trigger != Trigger.MANUAL)
{
- File logFile = new File(getInstallDir(), "setup.log");
- IWorkbenchWindow window = PlatformUI.getWorkbench().getWorkbenchWindows()[0];
- final Shell shell = window.getShell();
- ProgressLogDialog.run(shell, logFile, "Setting up IDE", new ProgressLogRunnable()
+ Shell shell = PlatformUI.getWorkbench().getWorkbenchWindows()[0].getShell();
+
+ ProgressLogDialog.run(shell, "Setting up IDE", new ProgressLogRunnable()
{
public boolean run(ProgressLog log) throws Exception
{
@@ -410,6 +451,7 @@ public class SetupTaskPerformer extends HashMap<Object, Object> implements Setup
for (SetupTask neededTask : neededTasks)
{
+ log("Performing setup task " + getLabel(neededTask));
neededTask.perform(this);
neededTask.dispose();
}
@@ -512,6 +554,12 @@ public class SetupTaskPerformer extends HashMap<Object, Object> implements Setup
return result;
}
+ private static String getLabel(Object object)
+ {
+ IItemLabelProvider labelProvider = (IItemLabelProvider)ADAPTER_FACTORY.adapt(object, IItemLabelProvider.class);
+ return labelProvider.getText(object);
+ }
+
public static ProgressLog getProgress()
{
return progress;
@@ -521,4 +569,39 @@ public class SetupTaskPerformer extends HashMap<Object, Object> implements Setup
{
SetupTaskPerformer.progress = progress;
}
+
+ static
+ {
+ STRING_FILTER_REGISTRY.put("uri", new StringFilter()
+ {
+ public String filter(String value)
+ {
+ return URI.createFileURI(value).toString();
+ }
+ });
+
+ STRING_FILTER_REGISTRY.put("upper", new StringFilter()
+ {
+ public String filter(String value)
+ {
+ return value.toUpperCase();
+ }
+ });
+
+ STRING_FILTER_REGISTRY.put("lower", new StringFilter()
+ {
+ public String filter(String value)
+ {
+ return value.toLowerCase();
+ }
+ });
+ }
+
+ /**
+ * @author Eike Stepper
+ */
+ public interface StringFilter
+ {
+ public String filter(String value);
+ }
}
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/ui/ProgressLogDialog.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/ui/ProgressLogDialog.java
index a157fba1e6..0cfa85cde3 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/ui/ProgressLogDialog.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/ui/ProgressLogDialog.java
@@ -16,8 +16,7 @@ import org.eclipse.emf.cdo.releng.setup.util.log.ProgressLog;
import org.eclipse.emf.cdo.releng.setup.util.log.ProgressLogProvider;
import org.eclipse.emf.cdo.releng.setup.util.log.ProgressLogRunnable;
-import org.eclipse.net4j.util.io.IOUtil;
-
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.OperationCanceledException;
@@ -41,10 +40,9 @@ import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.internal.progress.ProgressManager;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
+import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -52,11 +50,20 @@ public class ProgressLogDialog extends TitleAreaDialog implements ProgressLog
{
public static final String TITLE = "Setup Development Environment";
- private static final SimpleDateFormat TIME = new SimpleDateFormat("HH:mm:ss");
+ public static final SimpleDateFormat DATE_TIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- private static final SimpleDateFormat DATE_TIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ private static final SimpleDateFormat TIME = new SimpleDateFormat("HH:mm:ss");
- private PrintStream logStream;
+ private static final String[] IGNORED_PREFIXES = { "Scanning Git", "Re-indexing", "Calculating Decorations",
+ "Decorating", "http://", "The user operation is waiting", "Git repository changed", "Refreshing ", "Opening ",
+ "Connecting project ", "Searching for associated repositories.", "Preparing type ",
+ "Loading project description", "Generating cspec from PDE artifacts", "Reporting encoding changes", "Saving",
+ "Downloading software", "Java indexing...", "Computing Git status for ", "Configuring Plug-in Dependencies",
+ "Configuring JRE System Library", "Invoking builder on ", "Invoking '", "Verifying ", "Updating ...",
+ "Reading saved build state for project ", "Reading resource change information for ",
+ "Cleaning output folder for ", "Copying resources to the output folder", " adding component ",
+ "Preparing to build", "Compiling ", "Analyzing ", "Comparing ", "Checking ", "Build done",
+ "Processing API deltas..." };
private Text text;
@@ -68,21 +75,9 @@ public class ProgressLogDialog extends TitleAreaDialog implements ProgressLog
private String lastLine;
- private ProgressLogDialog(Shell parentShell, File logFile)
+ private ProgressLogDialog(Shell parentShell)
{
super(parentShell);
- if (logFile != null)
- {
- try
- {
- logFile.getParentFile().mkdirs();
- logStream = new PrintStream(new FileOutputStream(logFile, true));
- }
- catch (FileNotFoundException ex)
- {
- throw new RuntimeException(ex);
- }
- }
setHelpAvailable(false);
setShellStyle(SWT.BORDER | SWT.MAX | SWT.RESIZE | SWT.TITLE | SWT.APPLICATION_MODAL);
@@ -146,15 +141,6 @@ public class ProgressLogDialog extends TitleAreaDialog implements ProgressLog
{
SetupTaskPerformer.setProgress(null);
- if (logStream != null)
- {
- logStream.println();
- logStream.println();
- logStream.println();
- logStream.println();
- IOUtil.closeSilent(logStream);
- }
-
return super.close();
}
@@ -180,14 +166,7 @@ public class ProgressLogDialog extends TitleAreaDialog implements ProgressLog
}
if (line == null || line.length() == 0 || Character.isLowerCase(line.charAt(0)) || line.equals("Updating")
- || line.startsWith("Scanning Git") || line.startsWith("Re-indexing") || line.endsWith(" remaining.")
- || line.startsWith("Calculating Decorations") || line.startsWith("Decorating") || line.startsWith("http://")
- || line.startsWith("The user operation is waiting") || line.startsWith("Git repository changed")
- || line.startsWith("Refreshing ") || line.startsWith("Opening ") || line.startsWith("Connecting project ")
- || line.startsWith("Searching for associated repositories.") || line.startsWith("Preparing type ")
- || line.startsWith("Loading project description") || line.startsWith("Generating cspec from PDE artifacts")
- || line.startsWith("Reporting encoding changes") || line.startsWith("Saving")
- || line.startsWith("Downloading software") || line.startsWith("Java indexing..."))
+ || line.endsWith(" remaining.") || startsWithIgnoredPrefix(line))
{
return;
}
@@ -211,19 +190,6 @@ public class ProgressLogDialog extends TitleAreaDialog implements ProgressLog
final String message = line + "\n";
final Date date = new Date();
- if (logStream != null)
- {
- try
- {
- logStream.print("[" + DATE_TIME.format(date) + "] " + message);
- logStream.flush();
- }
- catch (Exception ex)
- {
- Activator.log(ex);
- }
- }
-
asyncExec(new Runnable()
{
public void run()
@@ -240,10 +206,14 @@ public class ProgressLogDialog extends TitleAreaDialog implements ProgressLog
});
}
+ public void log(IStatus status)
+ {
+ log(toString(status));
+ }
+
public void setFinished()
{
Job.getJobManager().setProgressProvider(ProgressManager.getInstance());
-
asyncExec(new Runnable()
{
public void run()
@@ -251,7 +221,6 @@ public class ProgressLogDialog extends TitleAreaDialog implements ProgressLog
try
{
okButton.setEnabled(true);
- cancelButton.setEnabled(false);
}
catch (Exception ex)
{
@@ -282,12 +251,26 @@ public class ProgressLogDialog extends TitleAreaDialog implements ProgressLog
}
}
- public static void run(Shell shell, File logFile, final String jobName, final ProgressLogRunnable runnable)
+ private static boolean startsWithIgnoredPrefix(String line)
+ {
+ for (int i = 0; i < IGNORED_PREFIXES.length; i++)
+ {
+ String prefix = IGNORED_PREFIXES[i];
+ if (line.startsWith(prefix))
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ public static void run(Shell shell, final String jobName, final ProgressLogRunnable runnable)
{
try
{
final boolean[] restart = { false };
- final ProgressLogDialog dialog = new ProgressLogDialog(shell, logFile);
+ final ProgressLogDialog dialog = new ProgressLogDialog(shell);
Runnable jobRunnable = new Runnable()
{
public void run()
@@ -345,4 +328,74 @@ public class ProgressLogDialog extends TitleAreaDialog implements ProgressLog
Activator.log(ex);
}
}
+
+ public static String toString(IStatus status)
+ {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ PrintStream printStream;
+ try
+ {
+ printStream = new PrintStream(out, false, "UTF-8");
+ deeplyPrint(status, printStream, 0);
+ printStream.close();
+ return new String(out.toByteArray(), "UTF-8");
+ }
+ catch (UnsupportedEncodingException ex)
+ {
+ return status.getMessage();
+ }
+ }
+
+ private static void deeplyPrint(IStatus status, PrintStream strm, int level)
+ {
+ appendLevelPrefix(strm, level);
+ String msg = status.getMessage();
+ strm.println(msg);
+ Throwable cause = status.getException();
+ if (cause != null)
+ {
+ strm.print("Caused by: ");
+ if (!(msg.equals(cause.getMessage()) || msg.equals(cause.toString())))
+ {
+ deeplyPrint(cause, strm, level);
+ }
+ }
+
+ if (status.isMultiStatus())
+ {
+ IStatus[] children = status.getChildren();
+ for (int i = 0; i < children.length; i++)
+ {
+ deeplyPrint(children[i], strm, level + 1);
+ }
+ }
+ }
+
+ private static void deeplyPrint(Throwable t, PrintStream strm, int level)
+ {
+ if (t instanceof CoreException)
+ {
+ deeplyPrint(t, strm, level);
+ }
+ else
+ {
+ appendLevelPrefix(strm, level);
+ strm.println(t.toString());
+ Throwable cause = t.getCause();
+ if (cause != null)
+ {
+ strm.print("Caused by: "); //$NON-NLS-1$
+ deeplyPrint(cause, strm, level);
+ }
+ }
+ }
+
+ private static void appendLevelPrefix(PrintStream strm, int level)
+ {
+ for (int idx = 0; idx < level; ++idx)
+ {
+ strm.print(' ');
+ }
+ }
+
}
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/ApiBaselineTask.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/ApiBaselineTask.java
index 7cd3160743..2435f8762a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/ApiBaselineTask.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/ApiBaselineTask.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/BuckminsterImportTask.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/BuckminsterImportTask.java
index 61d0267a23..c693f8957d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/BuckminsterImportTask.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/BuckminsterImportTask.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/CompoundSetupTask.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/CompoundSetupTask.java
index afca697901..f65eeca625 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/CompoundSetupTask.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/CompoundSetupTask.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/ConfigurableItem.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/ConfigurableItem.java
index d14e7d124e..3c60a5f251 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/ConfigurableItem.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/ConfigurableItem.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/EclipseIniTask.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/EclipseIniTask.java
index 766d59af65..046510755e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/EclipseIniTask.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/EclipseIniTask.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/EclipsePreferenceTask.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/EclipsePreferenceTask.java
index 077b3bad4b..800e4fd389 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/EclipsePreferenceTask.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/EclipsePreferenceTask.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.releng.setup;
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/GitCloneTask.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/GitCloneTask.java
index 7b1d812093..5a97fc6cc5 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/GitCloneTask.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/GitCloneTask.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
+ * All rights reser