eclipse · donat · Jul 23, 2024 · Jun 28, 2024 · Jul 1, 2024 · Jul 1, 2024
diff --git a/org.eclipse.buildship.core/src/main/java/org/eclipse/buildship/core/CompositeProperties.java b/org.eclipse.buildship.core/src/main/java/org/eclipse/buildship/core/CompositeProperties.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...java/org/eclipse/buildship/core/internal/configuration/BuildConfigurationPersistence.java b/...java/org/eclipse/buildship/core/internal/configuration/BuildConfigurationPersistence.java
@@ -58,13 +58,13 @@ public BuildConfigurationProperties readBuildConfiguratonProperties(File project
         return readPreferences(preferences, projectDir);
     }
 
-    public DefaultBuildConfigurationProperties readCompositeBuildProperties(File compositeDir) {
+    public BuildConfigurationProperties readCompositeBuildProperties(File compositeDir) {
         Preconditions.checkNotNull(compositeDir);
         PreferenceStore preferences = PreferenceStore.forPreferenceFile(compositeDir);
         return readPreferences(preferences, compositeDir);
     }
 
-    public void saveBuildConfiguration(IProject project, DefaultBuildConfigurationProperties properties) {
+    public void saveBuildConfiguration(IProject project, BuildConfigurationProperties properties) {
         Preconditions.checkNotNull(project);
         Preconditions.checkNotNull(properties);
         PreferenceStore preferences = PreferenceStore.forProjectScope(project, PREF_NODE);

diff --git a/...c/main/java/org/eclipse/buildship/core/internal/configuration/CompositeConfiguration.java b/...c/main/java/org/eclipse/buildship/core/internal/configuration/CompositeConfiguration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...java/org/eclipse/buildship/core/internal/configuration/DefaultCompositeConfiguration.java b/...java/org/eclipse/buildship/core/internal/configuration/DefaultCompositeConfiguration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...n/java/org/eclipse/buildship/core/internal/configuration/DefaultConfigurationManager.java b/...n/java/org/eclipse/buildship/core/internal/configuration/DefaultConfigurationManager.java
@@ -99,7 +99,7 @@ public BuildConfiguration loadBuildConfiguration(File rootDir) {
     }
 
     public BuildConfiguration loadBuildConfigurationForComposite(File fileDir) {
-        DefaultBuildConfigurationProperties buildConfigProperties = this.buildConfigurationPersistence.readCompositeBuildProperties(fileDir);
+        BuildConfigurationProperties buildConfigProperties = this.buildConfigurationPersistence.readCompositeBuildProperties(fileDir);
         return new DefaultBuildConfiguration(buildConfigProperties, loadWorkspaceConfiguration());
     }
 

diff --git a/...ship.core/src/main/java/org/eclipse/buildship/core/internal/workspace/BuildComposite.java b/...ship.core/src/main/java/org/eclipse/buildship/core/internal/workspace/BuildComposite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/org.eclipse.buildship.ui/plugin.xml b/org.eclipse.buildship.ui/plugin.xml
@@ -67,28 +67,6 @@
             name="Gradle">
       </category>
     </extension>
-
-    <!-- integration of a Gradle workspace composite creation wizard -->
-    <extension point="org.eclipse.ui.newWizards">
-    	<wizard
-            id="org.eclipse.buildship.ui.wizard.workspaceComposite.creation"
-            class="org.eclipse.buildship.ui.internal.wizard.workspacecomposite.WorkspaceCompositeCreationWizard"
-            category="org.eclipse.buildship.ui.creationwizards"
-            icon="icons/full/etool16/creation_wiz.png"
-            name="Gradle Composite"
-            canFinishEarly="false"
-            hasPages="true"
-            project="true">
-         <description>
-            Create a new Gradle workspace composite.
-         </description>
-         <keywordReference id="org.eclipse.buildship.ui.keyword.buildship"/>
-      </wizard>
-      <category
-            id="org.eclipse.buildship.ui.creationwizards"
-            name="Gradle">
-      </category>
-    </extension>
 
     <!-- definition of keywords available in search fields of Gradle project wizards -->
     <extension

diff --git a/...ui/src/main/java/org/eclipse/buildship/ui/internal/composite/WorkingSetProperyTester.java b/...ui/src/main/java/org/eclipse/buildship/ui/internal/composite/WorkingSetProperyTester.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...i/src/main/java/org/eclipse/buildship/ui/internal/preferences/AbstractPropertiesPage.java b/...i/src/main/java/org/eclipse/buildship/ui/internal/preferences/AbstractPropertiesPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...eclipse/buildship/ui/internal/preferences/GradleCompositeImportOptionsPreferencePage.java b/...eclipse/buildship/ui/internal/preferences/GradleCompositeImportOptionsPreferencePage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...g/eclipse/buildship/ui/internal/preferences/GradleCompositeRootProjectPreferencePage.java b/...g/eclipse/buildship/ui/internal/preferences/GradleCompositeRootProjectPreferencePage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...lipse/buildship/ui/internal/preferences/GradleCreateWorkspaceCompositePreferencePage.java b/...lipse/buildship/ui/internal/preferences/GradleCreateWorkspaceCompositePreferencePage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...org/eclipse/buildship/ui/internal/preferences/GradleWorkspaceCompositePreferencePage.java b/...org/eclipse/buildship/ui/internal/preferences/GradleWorkspaceCompositePreferencePage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -58,22 +58,15 @@ protected Control createContents(Composite parent) {
         this.workspaceCompositeNameText = new Text(workspaceCompositeNameComposite, SWT.BORDER);
         this.workspaceCompositeNameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
 
-<<<<<<< HEAD
-        this.gradleProjectCheckboxtreeComposite = new GradleProjectGroup(this.gradleWorkspaceCompositeSettingsComposite);
-=======
         this.gradleProjectCheckboxtreeComposite = new GradleProjectGroup(this.gradleWorkspaceCompositeSettingsComposite, true);
->>>>>>> kuzniarz-workspace-composites-rebased
+
         GridDataFactory.swtDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).span(3, SWT.DEFAULT).applyTo(this.gradleProjectCheckboxtreeComposite);
 
         return this.gradleWorkspaceCompositeSettingsComposite;
     }
 
     @Override
     public boolean performOk() {
-<<<<<<< HEAD
        return true;
-=======
-        return true;
->>>>>>> kuzniarz-workspace-composites-rebased
     }
 }
diff --git a/...a/org/eclipse/buildship/ui/internal/util/file/ExternalProjectDialogSelectionListener.java b/...a/org/eclipse/buildship/ui/internal/util/file/ExternalProjectDialogSelectionListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...ip.ui/src/main/java/org/eclipse/buildship/ui/internal/util/widget/GradleProjectGroup.java b/...ip.ui/src/main/java/org/eclipse/buildship/ui/internal/util/widget/GradleProjectGroup.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...ildship.ui/src/main/java/org/eclipse/buildship/ui/internal/view/task/RemoveComposite.java b/...ildship.ui/src/main/java/org/eclipse/buildship/ui/internal/view/task/RemoveComposite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/.../eclipse/buildship/ui/internal/wizard/workspacecomposite/AbstractCompositeWizardPage.java b/.../eclipse/buildship/ui/internal/wizard/workspacecomposite/AbstractCompositeWizardPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/.../java/org/eclipse/buildship/ui/internal/wizard/workspacecomposite/AbstractWizardPage.java b/.../java/org/eclipse/buildship/ui/internal/wizard/workspacecomposite/AbstractWizardPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...pse/buildship/ui/internal/wizard/workspacecomposite/AbstractWorkspaceCompositeWizard.java b/...pse/buildship/ui/internal/wizard/workspacecomposite/AbstractWorkspaceCompositeWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...a/org/eclipse/buildship/ui/internal/wizard/workspacecomposite/CompositeConfiguration.java b/...a/org/eclipse/buildship/ui/internal/wizard/workspacecomposite/CompositeConfiguration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...lipse/buildship/ui/internal/wizard/workspacecomposite/CompositeCreationConfiguration.java b/...lipse/buildship/ui/internal/wizard/workspacecomposite/CompositeCreationConfiguration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...se/buildship/ui/internal/wizard/workspacecomposite/CompositeCreationWizardController.java b/...se/buildship/ui/internal/wizard/workspacecomposite/CompositeCreationWizardController.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...ipse/buildship/ui/internal/wizard/workspacecomposite/CompositeImportWizardController.java b/...ipse/buildship/ui/internal/wizard/workspacecomposite/CompositeImportWizardController.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...se/buildship/ui/internal/wizard/workspacecomposite/CompositeRootProjectConfiguration.java b/...se/buildship/ui/internal/wizard/workspacecomposite/CompositeRootProjectConfiguration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...buildship/ui/internal/wizard/workspacecomposite/CompositeRootProjectWizardController.java b/...buildship/ui/internal/wizard/workspacecomposite/CompositeRootProjectWizardController.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...va/org/eclipse/buildship/ui/internal/wizard/workspacecomposite/ExternalGradleProject.java b/...va/org/eclipse/buildship/ui/internal/wizard/workspacecomposite/ExternalGradleProject.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...eclipse/buildship/ui/internal/wizard/workspacecomposite/ExternalGradleProjectAdapter.java b/...eclipse/buildship/ui/internal/wizard/workspacecomposite/ExternalGradleProjectAdapter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...clipse/buildship/ui/internal/wizard/workspacecomposite/ExternalProjectAdapterFactory.java b/...clipse/buildship/ui/internal/wizard/workspacecomposite/ExternalProjectAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...dship/ui/internal/wizard/workspacecomposite/GradleCreateWorkspaceCompositeWizardPage.java b/...dship/ui/internal/wizard/workspacecomposite/GradleCreateWorkspaceCompositeWizardPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...clipse/buildship/ui/internal/wizard/workspacecomposite/GradleImportOptionsWizardPage.java b/...clipse/buildship/ui/internal/wizard/workspacecomposite/GradleImportOptionsWizardPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/.../eclipse/buildship/ui/internal/wizard/workspacecomposite/GradleRootProjectWizardPage.java b/.../eclipse/buildship/ui/internal/wizard/workspacecomposite/GradleRootProjectWizardPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...ipse/buildship/ui/internal/wizard/workspacecomposite/GradleWorkspaceCompositeUpdater.java b/...ipse/buildship/ui/internal/wizard/workspacecomposite/GradleWorkspaceCompositeUpdater.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...java/org/eclipse/buildship/ui/internal/wizard/workspacecomposite/IGradleCompositeIDs.java b/...java/org/eclipse/buildship/ui/internal/wizard/workspacecomposite/IGradleCompositeIDs.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...pse/buildship/ui/internal/wizard/workspacecomposite/WorkspaceCompositeCreationWizard.java b/...pse/buildship/ui/internal/wizard/workspacecomposite/WorkspaceCompositeCreationWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...pse/buildship/ui/internal/wizard/workspacecomposite/WorkspaceCompositeWizardMessages.java b/...pse/buildship/ui/internal/wizard/workspacecomposite/WorkspaceCompositeWizardMessages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/...ain/java/org/eclipse/buildship/ui/internal/workspace/CompositePropertyChangeListener.java b/...ain/java/org/eclipse/buildship/ui/internal/workspace/CompositePropertyChangeListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/....ui/src/main/java/org/eclipse/buildship/ui/internal/workspace/RemoveCompositeHandler.java b/....ui/src/main/java/org/eclipse/buildship/ui/internal/workspace/RemoveCompositeHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/....buildship.ui/src/main/java/org/eclipse/buildship/ui/internal/workspace/StartupSetup.java b/....buildship.ui/src/main/java/org/eclipse/buildship/ui/internal/workspace/StartupSetup.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Gradle Inc.
+ * Copyright (c) 2023 Gradle Inc. and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0