diff options
235 files changed, 3043 insertions, 1594 deletions
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/CDOClientProtocol.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java index 3d212f0f8a..3096ef583f 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.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/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.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.properties b/plugins/org.eclipse.emf.cdo.releng.predicates/about.properties index 9134ef220b..d42abc52f7 100644 --- a/plugins/org.eclipse.emf.cdo.releng.predicates/about.properties +++ b/plugins/org.eclipse.emf.cdo.releng.predicates/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 @@ -21,11 +21,3 @@ 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..a85815f30a 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 diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.predicates/plugin.properties index 63fbb1d409..9065906d11 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 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/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/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..d42abc52f7 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 @@ -21,11 +21,3 @@ 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.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..9065906d11 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 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/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/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..d42abc52f7 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 @@ -21,11 +21,3 @@ 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.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..d3bd4177b3 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 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.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/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/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 67fbc42b85..9195b96369 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 @@ -57,15 +57,15 @@ public class ProgressLogDialog extends TitleAreaDialog implements ProgressLog private static final SimpleDateFormat DATE_TIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 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..." }; + "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 PrintStream logStream; @@ -296,7 +296,7 @@ public class ProgressLogDialog extends TitleAreaDialog implements ProgressLog return true; } } - + return false; } 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 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/LinkLocationTask.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/LinkLocationTask.java index 6a29e22e30..90266c5f5e 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/LinkLocationTask.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/LinkLocationTask.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/OneTimeSetupTask.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/OneTimeSetupTask.java index 325fd72b50..4472b6f9d5 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/OneTimeSetupTask.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/OneTimeSetupTask.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/P2Task.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/P2Task.java index 3292d5b9a8..1d9b4ac608 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/P2Task.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/P2Task.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/ResourceCopyTask.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/ResourceCopyTask.java index 2a6e470ef7..3e33007679 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/ResourceCopyTask.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/ResourceCopyTask.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/SetupTask.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupTask.java index 67280a0d2f..73742eb095 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupTask.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupTask.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/SetupTaskContainer.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupTaskContainer.java index ff3f5a7e87..c0063b71f8 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupTaskContainer.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupTaskContainer.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/SetupTaskScope.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupTaskScope.java index b31b3ad090..e121c0eb3f 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupTaskScope.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupTaskScope.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/StringVariableTask.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/StringVariableTask.java index 4dbaf7cfec..948fb763ed 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/StringVariableTask.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/StringVariableTask.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/TextModification.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/TextModification.java index e16971d568..dd18ae05df 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/TextModification.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/TextModification.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/TextModifyTask.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/TextModifyTask.java index e4036362c6..8389b4e261 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/TextModifyTask.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/TextModifyTask.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/Trigger.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/Trigger.java index 2247926e92..113af08525 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/Trigger.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/Trigger.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/WorkingSetTask.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/WorkingSetTask.java index 1d9ea1eb9e..39db4b1ed5 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/WorkingSetTask.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/WorkingSetTask.java @@ -1,8 +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.setup; import org.eclipse.emf.cdo.releng.workingsets.WorkingSet; + import org.eclipse.emf.common.util.EList; /** diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ApiBaselineTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ApiBaselineTaskImpl.java index 019df2d065..4c28be20b8 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ApiBaselineTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ApiBaselineTaskImpl.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.setup.impl; import org.eclipse.emf.cdo.releng.setup.ApiBaselineTask; @@ -127,8 +137,10 @@ public class ApiBaselineTaskImpl extends SetupTaskImpl implements ApiBaselineTas String oldVersion = version; version = newVersion; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.API_BASELINE_TASK__VERSION, oldVersion, version)); + } } /** @@ -151,8 +163,10 @@ public class ApiBaselineTaskImpl extends SetupTaskImpl implements ApiBaselineTas String oldZipLocation = zipLocation; zipLocation = newZipLocation; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.API_BASELINE_TASK__ZIP_LOCATION, oldZipLocation, zipLocation)); + } } /** @@ -240,7 +254,9 @@ public class ApiBaselineTaskImpl extends SetupTaskImpl implements ApiBaselineTas public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (version: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BuckminsterImportTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BuckminsterImportTaskImpl.java index 9c0d25e5f3..688e453882 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BuckminsterImportTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BuckminsterImportTaskImpl.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.impl; diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/CompoundSetupTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/CompoundSetupTaskImpl.java index 20256976ce..44eb1fafbe 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/CompoundSetupTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/CompoundSetupTaskImpl.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.impl; @@ -121,7 +129,9 @@ public class CompoundSetupTaskImpl extends SetupTaskImpl implements CompoundSetu String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.COMPOUND_SETUP_TASK__NAME, oldName, name)); + } } /** @@ -269,7 +279,9 @@ public class CompoundSetupTaskImpl extends SetupTaskImpl implements CompoundSetu public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ConfigurableItemImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ConfigurableItemImpl.java index 00e17e3e6b..c4ba37e0f6 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ConfigurableItemImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ConfigurableItemImpl.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.impl; diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipseIniTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipseIniTaskImpl.java index 4d36f17566..4eed5e3791 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipseIniTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipseIniTaskImpl.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.impl; @@ -138,7 +146,9 @@ public class EclipseIniTaskImpl extends SetupTaskImpl implements EclipseIniTask String oldOption = option; option = newOption; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.ECLIPSE_INI_TASK__OPTION, oldOption, option)); + } } /** @@ -161,7 +171,9 @@ public class EclipseIniTaskImpl extends SetupTaskImpl implements EclipseIniTask String oldValue = value; value = newValue; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.ECLIPSE_INI_TASK__VALUE, oldValue, value)); + } } /** @@ -184,7 +196,9 @@ public class EclipseIniTaskImpl extends SetupTaskImpl implements EclipseIniTask boolean oldVm = vm; vm = newVm; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.ECLIPSE_INI_TASK__VM, oldVm, vm)); + } } /** @@ -282,7 +296,9 @@ public class EclipseIniTaskImpl extends SetupTaskImpl implements EclipseIniTask public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (option: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipsePreferenceTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipsePreferenceTaskImpl.java index 3beed3cb54..2088fdd77f 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipsePreferenceTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipsePreferenceTaskImpl.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.impl; @@ -119,7 +127,9 @@ public class EclipsePreferenceTaskImpl extends SetupTaskImpl implements EclipseP String oldKey = key; key = newKey; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.ECLIPSE_PREFERENCE_TASK__KEY, oldKey, key)); + } } /** @@ -142,8 +152,10 @@ public class EclipsePreferenceTaskImpl extends SetupTaskImpl implements EclipseP String oldValue = value; value = newValue; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.ECLIPSE_PREFERENCE_TASK__VALUE, oldValue, value)); + } } /** @@ -231,7 +243,9 @@ public class EclipsePreferenceTaskImpl extends SetupTaskImpl implements EclipseP public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (key: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/GitCloneTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/GitCloneTaskImpl.java index a5ec45b520..1e4d7a4684 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/GitCloneTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/GitCloneTaskImpl.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.impl; diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/LinkLocationTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/LinkLocationTaskImpl.java index ac4727ba96..331ca76133 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/LinkLocationTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/LinkLocationTaskImpl.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.impl; @@ -115,7 +123,9 @@ public class LinkLocationTaskImpl extends SetupTaskImpl implements LinkLocationT String oldPath = path; path = newPath; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.LINK_LOCATION_TASK__PATH, oldPath, path)); + } } /** @@ -138,7 +148,9 @@ public class LinkLocationTaskImpl extends SetupTaskImpl implements LinkLocationT String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.LINK_LOCATION_TASK__NAME, oldName, name)); + } } /** @@ -226,7 +238,9 @@ public class LinkLocationTaskImpl extends SetupTaskImpl implements LinkLocationT public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (path: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/OneTimeSetupTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/OneTimeSetupTaskImpl.java index 85c24d9164..b725652cd6 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/OneTimeSetupTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/OneTimeSetupTaskImpl.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.impl; diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/P2TaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/P2TaskImpl.java index b948f95368..f02f8be70d 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/P2TaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/P2TaskImpl.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.impl; diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ResourceCopyTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ResourceCopyTaskImpl.java index c033ee8969..ea233a23ea 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ResourceCopyTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ResourceCopyTaskImpl.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.impl; @@ -114,8 +122,10 @@ public class ResourceCopyTaskImpl extends SetupTaskImpl implements ResourceCopyT String oldSourceURL = sourceURL; sourceURL = newSourceURL; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.RESOURCE_COPY_TASK__SOURCE_URL, oldSourceURL, sourceURL)); + } } /** @@ -138,8 +148,10 @@ public class ResourceCopyTaskImpl extends SetupTaskImpl implements ResourceCopyT String oldTargetURL = targetURL; targetURL = newTargetURL; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.RESOURCE_COPY_TASK__TARGET_URL, oldTargetURL, targetURL)); + } } /** @@ -227,7 +239,9 @@ public class ResourceCopyTaskImpl extends SetupTaskImpl implements ResourceCopyT public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (sourceURL: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupFactoryImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupFactoryImpl.java index c2baca746b..502b1ce6a7 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupFactoryImpl.java @@ -35,6 +35,7 @@ import org.eclipse.emf.cdo.releng.setup.TextModification; import org.eclipse.emf.cdo.releng.setup.TextModifyTask; import org.eclipse.emf.cdo.releng.setup.Trigger; import org.eclipse.emf.cdo.releng.setup.WorkingSetTask; + import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; @@ -42,6 +43,7 @@ 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.HashSet; import java.util.Set; diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupTaskContainerImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupTaskContainerImpl.java index 3a5df4b135..b5e3fb5ee3 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupTaskContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupTaskContainerImpl.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.impl; diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupTaskImpl.java index 10c774abc6..b2bc6851ae 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupTaskImpl.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.impl; diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/StringVariableTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/StringVariableTaskImpl.java index f3c5461fc6..149f544714 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/StringVariableTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/StringVariableTaskImpl.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.impl; @@ -141,7 +149,9 @@ public class StringVariableTaskImpl extends SetupTaskImpl implements StringVaria String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.STRING_VARIABLE_TASK__NAME, oldName, name)); + } } /** @@ -164,7 +174,9 @@ public class StringVariableTaskImpl extends SetupTaskImpl implements StringVaria String oldValue = value; value = newValue; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.STRING_VARIABLE_TASK__VALUE, oldValue, value)); + } } /** @@ -187,8 +199,10 @@ public class StringVariableTaskImpl extends SetupTaskImpl implements StringVaria String oldDescription = description; description = newDescription; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.STRING_VARIABLE_TASK__DESCRIPTION, oldDescription, description)); + } } /** @@ -286,7 +300,9 @@ public class StringVariableTaskImpl extends SetupTaskImpl implements StringVaria public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TextModificationImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TextModificationImpl.java index 15125bc0b7..d9f1748b62 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TextModificationImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TextModificationImpl.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.impl; @@ -101,8 +109,10 @@ public class TextModificationImpl extends MinimalEObjectImpl.Container implement String oldPattern = pattern; pattern = newPattern; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.TEXT_MODIFICATION__PATTERN, oldPattern, pattern)); + } } /** @@ -207,7 +217,9 @@ public class TextModificationImpl extends MinimalEObjectImpl.Container implement public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (pattern: "); @@ -218,4 +230,4 @@ public class TextModificationImpl extends MinimalEObjectImpl.Container implement return result.toString(); } -} //TextModificationImpl +} // TextModificationImpl diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TextModifyTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TextModifyTaskImpl.java index 6ede46e41e..f22594d67d 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TextModifyTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TextModifyTaskImpl.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.impl; @@ -105,7 +113,9 @@ public class TextModifyTaskImpl extends SetupTaskImpl implements TextModifyTask String oldUrl = url; url = newUrl; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.TEXT_MODIFY_TASK__URL, oldUrl, url)); + } } /** @@ -226,7 +236,9 @@ public class TextModifyTaskImpl extends SetupTaskImpl implements TextModifyTask public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (url: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/WorkingSetTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/WorkingSetTaskImpl.java index c45a4b1f7b..54d1bc287a 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/WorkingSetTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/WorkingSetTaskImpl.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.impl; diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/SetupAdapterFactory.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/SetupAdapterFactory.java index 8867ca7292..097e50cb58 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/SetupAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/SetupAdapterFactory.java @@ -36,6 +36,7 @@ import org.eclipse.emf.cdo.releng.setup.StringVariableTask; import org.eclipse.emf.cdo.releng.setup.TextModification; import org.eclipse.emf.cdo.releng.setup.TextModifyTask; import org.eclipse.emf.cdo.releng.setup.WorkingSetTask; + import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/SetupSwitch.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/SetupSwitch.java index 44af8cb514..50059e336e 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/SetupSwitch.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/SetupSwitch.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.util; @@ -28,8 +36,10 @@ import org.eclipse.emf.cdo.releng.setup.StringVariableTask; import org.eclipse.emf.cdo.releng.setup.TextModification; import org.eclipse.emf.cdo.releng.setup.TextModifyTask; import org.eclipse.emf.cdo.releng.setup.WorkingSetTask; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; + import java.util.List; /** @@ -114,11 +124,17 @@ public class SetupSwitch<T> EclipseVersion eclipseVersion = (EclipseVersion)theEObject; T result = caseEclipseVersion(eclipseVersion); if (result == null) + { result = caseConfigurableItem(eclipseVersion); + } if (result == null) + { result = caseSetupTaskContainer(eclipseVersion); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.CONFIGURATION: @@ -126,7 +142,9 @@ public class SetupSwitch<T> Configuration configuration = (Configuration)theEObject; T result = caseConfiguration(configuration); if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.CONFIGURABLE_ITEM: @@ -134,9 +152,13 @@ public class SetupSwitch<T> ConfigurableItem configurableItem = (ConfigurableItem)theEObject; T result = caseConfigurableItem(configurableItem); if (result == null) + { result = caseSetupTaskContainer(configurableItem); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.PROJECT: @@ -144,11 +166,17 @@ public class SetupSwitch<T> Project project = (Project)theEObject; T result = caseProject(project); if (result == null) + { result = caseConfigurableItem(project); + } if (result == null) + { result = caseSetupTaskContainer(project); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.BRANCH: @@ -156,11 +184,17 @@ public class SetupSwitch<T> Branch branch = (Branch)theEObject; T result = caseBranch(branch); if (result == null) + { result = caseConfigurableItem(branch); + } if (result == null) + { result = caseSetupTaskContainer(branch); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.PREFERENCES: @@ -168,9 +202,13 @@ public class SetupSwitch<T> Preferences preferences = (Preferences)theEObject; T result = casePreferences(preferences); if (result == null) + { result = caseSetupTaskContainer(preferences); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.SETUP: @@ -178,7 +216,9 @@ public class SetupSwitch<T> Setup setup = (Setup)theEObject; T result = caseSetup(setup); if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.SETUP_TASK: @@ -186,7 +226,9 @@ public class SetupSwitch<T> SetupTask setupTask = (SetupTask)theEObject; T result = caseSetupTask(setupTask); if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.SETUP_TASK_CONTAINER: @@ -194,7 +236,9 @@ public class SetupSwitch<T> SetupTaskContainer setupTaskContainer = (SetupTaskContainer)theEObject; T result = caseSetupTaskContainer(setupTaskContainer); if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.COMPOUND_SETUP_TASK: @@ -202,11 +246,17 @@ public class SetupSwitch<T> CompoundSetupTask compoundSetupTask = (CompoundSetupTask)theEObject; T result = caseCompoundSetupTask(compoundSetupTask); if (result == null) + { result = caseSetupTask(compoundSetupTask); + } if (result == null) + { result = caseSetupTaskContainer(compoundSetupTask); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.ONE_TIME_SETUP_TASK: @@ -214,9 +264,13 @@ public class SetupSwitch<T> OneTimeSetupTask oneTimeSetupTask = (OneTimeSetupTask)theEObject; T result = caseOneTimeSetupTask(oneTimeSetupTask); if (result == null) + { result = caseSetupTask(oneTimeSetupTask); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.ECLIPSE_INI_TASK: @@ -224,9 +278,13 @@ public class SetupSwitch<T> EclipseIniTask eclipseIniTask = (EclipseIniTask)theEObject; T result = caseEclipseIniTask(eclipseIniTask); if (result == null) + { result = caseSetupTask(eclipseIniTask); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.LINK_LOCATION_TASK: @@ -234,9 +292,13 @@ public class SetupSwitch<T> LinkLocationTask linkLocationTask = (LinkLocationTask)theEObject; T result = caseLinkLocationTask(linkLocationTask); if (result == null) + { result = caseSetupTask(linkLocationTask); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.P2_TASK: @@ -244,9 +306,13 @@ public class SetupSwitch<T> P2Task p2Task = (P2Task)theEObject; T result = caseP2Task(p2Task); if (result == null) + { result = caseSetupTask(p2Task); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.INSTALLABLE_UNIT: @@ -254,7 +320,9 @@ public class SetupSwitch<T> InstallableUnit installableUnit = (InstallableUnit)theEObject; T result = caseInstallableUnit(installableUnit); if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.P2_REPOSITORY: @@ -262,7 +330,9 @@ public class SetupSwitch<T> P2Repository p2Repository = (P2Repository)theEObject; T result = caseP2Repository(p2Repository); if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.BUCKMINSTER_IMPORT_TASK: @@ -270,9 +340,13 @@ public class SetupSwitch<T> BuckminsterImportTask buckminsterImportTask = (BuckminsterImportTask)theEObject; T result = caseBuckminsterImportTask(buckminsterImportTask); if (result == null) + { result = caseSetupTask(buckminsterImportTask); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.API_BASELINE_TASK: @@ -280,9 +354,13 @@ public class SetupSwitch<T> ApiBaselineTask apiBaselineTask = (ApiBaselineTask)theEObject; T result = caseApiBaselineTask(apiBaselineTask); if (result == null) + { result = caseSetupTask(apiBaselineTask); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.GIT_CLONE_TASK: @@ -290,9 +368,13 @@ public class SetupSwitch<T> GitCloneTask gitCloneTask = (GitCloneTask)theEObject; T result = caseGitCloneTask(gitCloneTask); if (result == null) + { result = caseSetupTask(gitCloneTask); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.ECLIPSE_PREFERENCE_TASK: @@ -300,9 +382,13 @@ public class SetupSwitch<T> EclipsePreferenceTask eclipsePreferenceTask = (EclipsePreferenceTask)theEObject; T result = caseEclipsePreferenceTask(eclipsePreferenceTask); if (result == null) + { result = caseSetupTask(eclipsePreferenceTask); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.STRING_VARIABLE_TASK: @@ -310,9 +396,13 @@ public class SetupSwitch<T> StringVariableTask stringVariableTask = (StringVariableTask)theEObject; T result = caseStringVariableTask(stringVariableTask); if (result == null) + { result = caseSetupTask(stringVariableTask); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.WORKING_SET_TASK: @@ -320,9 +410,13 @@ public class SetupSwitch<T> WorkingSetTask workingSetTask = (WorkingSetTask)theEObject; T result = caseWorkingSetTask(workingSetTask); if (result == null) + { result = caseSetupTask(workingSetTask); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.RESOURCE_COPY_TASK: @@ -330,9 +424,13 @@ public class SetupSwitch<T> ResourceCopyTask resourceCopyTask = (ResourceCopyTask)theEObject; T result = caseResourceCopyTask(resourceCopyTask); if (result == null) + { result = caseSetupTask(resourceCopyTask); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.TEXT_MODIFY_TASK: @@ -340,9 +438,13 @@ public class SetupSwitch<T> TextModifyTask textModifyTask = (TextModifyTask)theEObject; T result = caseTextModifyTask(textModifyTask); if (result == null) + { result = caseSetupTask(textModifyTask); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case SetupPackage.TEXT_MODIFICATION: @@ -350,7 +452,9 @@ public class SetupSwitch<T> TextModification textModification = (TextModification)theEObject; T result = caseTextModification(textModification); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.releng.ui/build.properties b/plugins/org.eclipse.emf.cdo.releng.ui/build.properties index fd1bda38c4..1b9b332720 100644 --- a/plugins/org.eclipse.emf.cdo.releng.ui/build.properties +++ b/plugins/org.eclipse.emf.cdo.releng.ui/build.properties @@ -1,4 +1,4 @@ -# 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.ui/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.ui/plugin.properties index 3aab2f8dbb..18802a85c6 100644 --- a/plugins/org.eclipse.emf.cdo.releng.ui/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.releng.ui/plugin.properties @@ -1,4 +1,4 @@ -# 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.ui/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.ui/plugin.xml index 47177ad11c..be943077cd 100644 --- a/plugins/org.eclipse.emf.cdo.releng.ui/plugin.xml +++ b/plugins/org.eclipse.emf.cdo.releng.ui/plugin.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.4"?> <!-- - 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.ui/src/org/eclipse/emf/cdo/releng/ui/Activator.java b/plugins/org.eclipse.emf.cdo.releng.ui/src/org/eclipse/emf/cdo/releng/ui/Activator.java index 30323d4555..f8687837ae 100644 --- a/plugins/org.eclipse.emf.cdo.releng.ui/src/org/eclipse/emf/cdo/releng/ui/Activator.java +++ b/plugins/org.eclipse.emf.cdo.releng.ui/src/org/eclipse/emf/cdo/releng/ui/Activator.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.ui/src/org/eclipse/emf/cdo/releng/ui/preferences/RelengPreferencePage.java b/plugins/org.eclipse.emf.cdo.releng.ui/src/org/eclipse/emf/cdo/releng/ui/preferences/RelengPreferencePage.java index 03f26c665f..79a25b3757 100644 --- a/plugins/org.eclipse.emf.cdo.releng.ui/src/org/eclipse/emf/cdo/releng/ui/preferences/RelengPreferencePage.java +++ b/plugins/org.eclipse.emf.cdo.releng.ui/src/org/eclipse/emf/cdo/releng/ui/preferences/RelengPreferencePage.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.workingsets.edit/src/org/eclipse/emf/cdo/releng/workingsets/provider/WorkingSetItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.workingsets.edit/src/org/eclipse/emf/cdo/releng/workingsets/provider/WorkingSetItemProvider.java index cd709b243d..aac7aa2871 100644 --- a/plugins/org.eclipse.emf.cdo.releng.workingsets.edit/src/org/eclipse/emf/cdo/releng/workingsets/provider/WorkingSetItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.releng.workingsets.edit/src/org/eclipse/emf/cdo/releng/workingsets/provider/WorkingSetItemProvider.java @@ -10,8 +10,10 @@ */ package org.eclipse.emf.cdo.releng.workingsets.provider; +import org.eclipse.emf.cdo.releng.predicates.PredicatesFactory; import org.eclipse.emf.cdo.releng.workingsets.WorkingSet; import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; @@ -26,9 +28,9 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; 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; -import org.eclipse.emf.cdo.releng.predicates.PredicatesFactory; /** * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.workingsets.WorkingSet} object. diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets.edit/src/org/eclipse/emf/cdo/releng/workingsets/provider/WorkingSetsEditPlugin.java b/plugins/org.eclipse.emf.cdo.releng.workingsets.edit/src/org/eclipse/emf/cdo/releng/workingsets/provider/WorkingSetsEditPlugin.java index 2f963e7e4d..2e38dfa524 100644 --- a/plugins/org.eclipse.emf.cdo.releng.workingsets.edit/src/org/eclipse/emf/cdo/releng/workingsets/provider/WorkingSetsEditPlugin.java +++ b/plugins/org.eclipse.emf.cdo.releng.workingsets.edit/src/org/eclipse/emf/cdo/releng/workingsets/provider/WorkingSetsEditPlugin.java @@ -11,6 +11,7 @@ package org.eclipse.emf.cdo.releng.workingsets.provider; import org.eclipse.emf.cdo.releng.predicates.provider.PredicatesEditPlugin; + import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.util.ResourceLocator; diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets.editor/src/org/eclipse/emf/cdo/releng/workingsets/presentation/WorkingSetsEditor.java b/plugins/org.eclipse.emf.cdo.releng.workingsets.editor/src/org/eclipse/emf/cdo/releng/workingsets/presentation/WorkingSetsEditor.java index db7d61c916..6a2ca92c82 100644 --- a/plugins/org.eclipse.emf.cdo.releng.workingsets.editor/src/org/eclipse/emf/cdo/releng/workingsets/presentation/WorkingSetsEditor.java +++ b/plugins/org.eclipse.emf.cdo.releng.workingsets.editor/src/org/eclipse/emf/cdo/releng/workingsets/presentation/WorkingSetsEditor.java @@ -10,10 +10,10 @@ */ package org.eclipse.emf.cdo.releng.workingsets.presentation; +import org.eclipse.emf.cdo.releng.predicates.provider.PredicatesItemProviderAdapterFactory; import org.eclipse.emf.cdo.releng.workingsets.impl.PreferencesURIHandlerImpl; import org.eclipse.emf.cdo.releng.workingsets.provider.WorkingSetsItemProviderAdapterFactory; -import org.eclipse.emf.cdo.releng.predicates.provider.PredicatesItemProviderAdapterFactory; import org.eclipse.emf.common.command.BasicCommandStack; import org.eclipse.emf.common.command.Command; import org.eclipse.emf.common.command.CommandStack; diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets.editor/src/org/eclipse/emf/cdo/releng/workingsets/presentation/WorkingSetsEditorPlugin.java b/plugins/org.eclipse.emf.cdo.releng.workingsets.editor/src/org/eclipse/emf/cdo/releng/workingsets/presentation/WorkingSetsEditorPlugin.java index e37dbc5e9a..da563d1ec6 100644 --- a/plugins/org.eclipse.emf.cdo.releng.workingsets.editor/src/org/eclipse/emf/cdo/releng/workingsets/presentation/WorkingSetsEditorPlugin.java +++ b/plugins/org.eclipse.emf.cdo.releng.workingsets.editor/src/org/eclipse/emf/cdo/releng/workingsets/presentation/WorkingSetsEditorPlugin.java @@ -11,6 +11,7 @@ package org.eclipse.emf.cdo.releng.workingsets.presentation; import org.eclipse.emf.cdo.releng.predicates.provider.PredicatesEditPlugin; + 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.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSet.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSet.java index 7ebf110ab6..9e2f16a94f 100644 --- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSet.java +++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSet.java @@ -11,6 +11,7 @@ package org.eclipse.emf.cdo.releng.workingsets; import org.eclipse.emf.cdo.releng.predicates.Predicate; + import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetImpl.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetImpl.java index 4f4648b555..d53c96b12c 100644 --- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetImpl.java @@ -10,8 +10,10 @@ */ package org.eclipse.emf.cdo.releng.workingsets.impl; +import org.eclipse.emf.cdo.releng.predicates.Predicate; import org.eclipse.emf.cdo.releng.workingsets.WorkingSet; import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; @@ -21,8 +23,8 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; + import java.util.Collection; -import org.eclipse.emf.cdo.releng.predicates.Predicate; /** * <!-- begin-user-doc --> diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsFactoryImpl.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsFactoryImpl.java index bed7e75bbd..6411e08e84 100644 --- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsFactoryImpl.java @@ -10,7 +10,11 @@ */ package org.eclipse.emf.cdo.releng.workingsets.impl; -import org.eclipse.emf.cdo.releng.workingsets.*; +import org.eclipse.emf.cdo.releng.workingsets.WorkingSet; +import org.eclipse.emf.cdo.releng.workingsets.WorkingSetGroup; +import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsFactory; +import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsPackageImpl.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsPackageImpl.java index b1241d98a6..9edf3793cf 100644 --- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsPackageImpl.java @@ -10,18 +10,20 @@ */ package org.eclipse.emf.cdo.releng.workingsets.impl; +import org.eclipse.emf.cdo.releng.predicates.PredicatesPackage; import org.eclipse.emf.cdo.releng.workingsets.WorkingSet; import org.eclipse.emf.cdo.releng.workingsets.WorkingSetGroup; import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsFactory; import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage; + import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; 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; -import org.eclipse.emf.cdo.releng.predicates.PredicatesPackage; /** * <!-- begin-user-doc --> diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsAdapterFactory.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsAdapterFactory.java index 4ffaac018a..f891c379a3 100644 --- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsAdapterFactory.java @@ -10,7 +10,10 @@ */ package org.eclipse.emf.cdo.releng.workingsets.util; -import org.eclipse.emf.cdo.releng.workingsets.*; +import org.eclipse.emf.cdo.releng.workingsets.WorkingSet; +import org.eclipse.emf.cdo.releng.workingsets.WorkingSetGroup; +import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage; + import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsSwitch.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsSwitch.java index 0269b870ad..c0ace2837f 100644 --- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsSwitch.java +++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsSwitch.java @@ -10,7 +10,10 @@ */ package org.eclipse.emf.cdo.releng.workingsets.util; -import org.eclipse.emf.cdo.releng.workingsets.*; +import org.eclipse.emf.cdo.releng.workingsets.WorkingSet; +import org.eclipse.emf.cdo.releng.workingsets.WorkingSetGroup; +import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage; + import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.util.Switch; diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Directory.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Directory.java index bddd41d7d5..c1f85a28f3 100644 --- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Directory.java +++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Directory.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.security/src/org/eclipse/emf/cdo/security/Group.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Group.java index 6a7b674cf0..acb8563bfe 100644 --- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Group.java +++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Group.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.security/src/org/eclipse/emf/cdo/security/Role.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Role.java index 7f14079d72..5707bd223f 100644 --- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Role.java +++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Role.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.security/src/org/eclipse/emf/cdo/security/User.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/User.java index 0361c9148d..c3380e93ed 100644 --- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/User.java +++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/User.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.security/src/org/eclipse/emf/cdo/security/impl/DerivedList.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/DerivedList.java index 14df3b5f97..a6113921e6 100644 --- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/DerivedList.java +++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/DerivedList.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.security/src/org/eclipse/emf/cdo/security/impl/GroupImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/GroupImpl.java index 3d6f3ad4fd..9ab35c1c21 100644 --- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/GroupImpl.java +++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/GroupImpl.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.security/src/org/eclipse/emf/cdo/security/impl/UserImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/UserImpl.java index 0525a34ecd..89494d4b67 100644 --- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/UserImpl.java +++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/UserImpl.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.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java index 6708c5e9ce..64cf2cf4b4 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java +++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.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.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitNotificationRequest.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitNotificationRequest.java index 3210ac7088..17601973f1 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitNotificationRequest.java +++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitNotificationRequest.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.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadPermissionsIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadPermissionsIndication.java index b81b06a86e..9235fd146e 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadPermissionsIndication.java +++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadPermissionsIndication.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.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryIndication.java index e8e927d64f..a248fa2047 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryIndication.java +++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryIndication.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.server/src/org/eclipse/emf/cdo/internal/server/QueryManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryManager.java index 765f9703e7..00a34fb1f4 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryManager.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryManager.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.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java index e9754677a5..07e6bbb346 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.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.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.java index 4430eb417f..98425e1119 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedServerSessionProtocol.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.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java index 5e64a55a3a..d26e59f9c3 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.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.server/src/org/eclipse/emf/cdo/spi/server/ISessionProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/ISessionProtocol.java index 6199122f0c..d23bef2ca1 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/ISessionProtocol.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/ISessionProtocol.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.server/src/org/eclipse/emf/cdo/spi/server/InternalSession.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSession.java index cb8370f125..f8e0411f71 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSession.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSession.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.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java index afb5bcdcc9..0f30df3bcd 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.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.tests.db/AllTestsDBDB2NonAudit.java b/plugins/org.eclipse.emf.cdo.tests.db/AllTestsDBDB2NonAudit.java index 8653fdbdfd..0f4eda1e74 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/AllTestsDBDB2NonAudit.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/AllTestsDBDB2NonAudit.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.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/DBOfflineConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/DBOfflineConfig.java index 6d0b193b4b..5031f26740 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/DBOfflineConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/DBOfflineConfig.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.tests/src/org/eclipse/emf/cdo/tests/MEMStoreQueryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MEMStoreQueryTest.java index fc86c90b0c..ee04d77f10 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MEMStoreQueryTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MEMStoreQueryTest.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.tests/src/org/eclipse/emf/cdo/tests/util/TestSessionManager.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestSessionManager.java index d3b1370086..d77da6d56f 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestSessionManager.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestSessionManager.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.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java index 7165dde9ac..2c7cb25f7b 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2007-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/src/org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.java index c10fbc86fd..5e46216b75 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.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/src/org/eclipse/emf/internal/cdo/session/DelegatingSessionProtocol.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/DelegatingSessionProtocol.java index af0b18fc1d..f4354f4949 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/DelegatingSessionProtocol.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/DelegatingSessionProtocol.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/src/org/eclipse/emf/internal/cdo/session/SessionUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/SessionUtil.java index 49ce1fb960..4a8a223cf6 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/SessionUtil.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/SessionUtil.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.net4j.db/src/org/eclipse/net4j/db/IDBConnectionProvider2.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBConnectionProvider2.java index 98731365f1..e300f9deaa 100644 --- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBConnectionProvider2.java +++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBConnectionProvider2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 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.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java index 53fca9c632..0d9de51140 100644 --- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java +++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2008, 2011, 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2007, 2008, 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.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java index d80ea4dde8..8f820c8f36 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2007-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.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java index d752c16839..4fcbee3944 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2007-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.net4j.util/src/org/eclipse/net4j/util/io/DataInputExtender.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataInputExtender.java index d30eab098c..3a93c37867 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataInputExtender.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataInputExtender.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2008, 2010-2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2007, 2008, 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.net4j.util/src/org/eclipse/net4j/util/io/DataOutputExtender.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataOutputExtender.java index dda9b73cf4..c93eab8b8e 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataOutputExtender.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataOutputExtender.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2008, 2010-2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2007, 2008, 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.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInput.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInput.java index faa4263a49..f52c4e2983 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInput.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2007-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.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInputStream.java index b57de4d1bb..de26cee06c 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInputStream.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2008, 2010-2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2007, 2008, 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.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutput.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutput.java index 29c32aa0ae..f3d47ce989 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutput.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2007-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.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutputStream.java index 3f5a944415..00f389aa6e 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutputStream.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2008, 2010-2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2007, 2008, 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.net4j.util/src/org/eclipse/net4j/util/security/PasswordCredentials.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/PasswordCredentials.java index 8eb098e2f4..8a812eac19 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/PasswordCredentials.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/PasswordCredentials.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2011, 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2008, 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.net4j/src/org/eclipse/net4j/signal/RemoteException.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteException.java index 631c7a60a7..a84f4a26f2 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteException.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2011, 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2008, 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.net4j/src/org/eclipse/net4j/signal/RemoteExceptionIndication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionIndication.java index 501064b8e2..bed29ff7a8 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionIndication.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionIndication.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.net4j/src/org/eclipse/net4j/signal/RemoteExceptionRequest.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionRequest.java index 1632e10d5d..6d17e527e8 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionRequest.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionRequest.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.gastro.server/src/org/gastro/internal/server/OM.java b/plugins/org.gastro.server/src/org/gastro/internal/server/OM.java index e60e095919..5178247345 100644 --- a/plugins/org.gastro.server/src/org/gastro/internal/server/OM.java +++ b/plugins/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 |