You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2016/11/20 08:50:22 UTC
svn commit: r1770537 - in /sling/trunk/tooling/ide:
eclipse-m2e-test/src/org/apache/sling/ide/eclipse/m2e/
eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/
eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/
Author: kwin
Date: Sun Nov 20 08:50:21 2016
New Revision: 1770537
URL: http://svn.apache.org/viewvc?rev=1770537&view=rev
Log:
SLING-6304 get rid of EmbeddedArchetypeInstaller which is no longer in use
Removed:
sling/trunk/tooling/ide/eclipse-m2e-test/src/org/apache/sling/ide/eclipse/m2e/EmbeddedArchetypeInstallerTest.java
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/EmbeddedArchetypeInstaller.java
Modified:
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ChooseArchetypeWizardPage.java
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/NewSlingBundleWizard.java
Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java?rev=1770537&r1=1770536&r2=1770537&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java Sun Nov 20 08:50:21 2016
@@ -39,8 +39,8 @@ import org.eclipse.wst.server.core.IServ
public abstract class AbstractNewMavenBasedSlingApplicationWizard extends AbstractNewSlingApplicationWizard {
private ChooseArchetypeWizardPage chooseArchetypePage;
private ArchetypeParametersWizardPage archetypeParametersPage;
- public abstract void installArchetypes();
- public abstract boolean acceptsArchetype(Archetype archetype2);
+
+ public abstract boolean acceptsArchetype(Archetype archetype);
/**
* Constructor for AbstractNewMavenBasedSlingApplicationWizard.
@@ -55,7 +55,8 @@ public abstract class AbstractNewMavenBa
/**
* Adding the page to the wizard.
*/
- public void addPages() {
+ @Override
+ public void addPages() {
chooseArchetypePage = new ChooseArchetypeWizardPage(this);
addPage(chooseArchetypePage);
archetypeParametersPage = createArchetypeParametersWizardPage();
@@ -71,7 +72,8 @@ public abstract class AbstractNewMavenBa
return chooseArchetypePage;
}
- protected List<IProject> createProjects(IProgressMonitor monitor) throws CoreException {
+ @Override
+ protected List<IProject> createProjects(IProgressMonitor monitor) throws CoreException {
IPath location = chooseArchetypePage.getLocation();
Archetype archetype = chooseArchetypePage.getSelectedArchetype();
@@ -99,6 +101,7 @@ public abstract class AbstractNewMavenBa
}
+ @Override
protected Projects configureCreatedProjects(List<IProject> createdProjects, IProgressMonitor monitor)
throws CoreException {
Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ChooseArchetypeWizardPage.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ChooseArchetypeWizardPage.java?rev=1770537&r1=1770536&r2=1770537&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ChooseArchetypeWizardPage.java (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ChooseArchetypeWizardPage.java Sun Nov 20 08:50:21 2016
@@ -120,7 +120,8 @@ public class ChooseArchetypeWizardPage e
return (AbstractNewMavenBasedSlingApplicationWizard) super.getWizard();
}
- public void createControl(Composite parent) {
+ @Override
+ public void createControl(Composite parent) {
Composite container = new Composite(parent, SWT.NULL);
GridLayout layout = new GridLayout();
container.setLayout(layout);
@@ -133,7 +134,8 @@ public class ChooseArchetypeWizardPage e
useDefaultWorkspaceLocationButton
.setText("Use default Workspace location");
useDefaultWorkspaceLocationButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
boolean inWorkspace = useDefaultWorkspaceLocationButton.getSelection();
locationLabel.setEnabled(!inWorkspace);
locationCombo.setEnabled(!inWorkspace);
@@ -153,7 +155,8 @@ public class ChooseArchetypeWizardPage e
GridData locationComboData = new GridData(SWT.FILL, SWT.CENTER, true, false);
locationCombo.setLayoutData(locationComboData);
locationCombo.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
+ @Override
+ public void modifyText(ModifyEvent e) {
dialogChanged();
}
});
@@ -164,7 +167,8 @@ public class ChooseArchetypeWizardPage e
locationBrowseButton.setLayoutData(locationBrowseButtonData);
locationBrowseButton.setText("Browse...");
locationBrowseButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
DirectoryDialog dialog = new DirectoryDialog(getShell());
dialog.setText("Select Location");
@@ -340,9 +344,6 @@ public class ChooseArchetypeWizardPage e
ArchetypeManager manager = MavenPluginActivator.getDefault().getArchetypeManager();
monitor.worked(1);
- // optionally allow the parent to install any archetypes
- getWizard().installArchetypes();
-
Collection<ArchetypeCatalogFactory> archetypeCatalogs = manager.getArchetypeCatalogs();
monitor.worked(2);
ArrayList<Archetype> candidates = new ArrayList<>();
@@ -387,6 +388,7 @@ public class ChooseArchetypeWizardPage e
if (changed || archetypesMap.isEmpty()) {
logger.trace("Triggering refresh since changed is true");
Display.getDefault().asyncExec(new Runnable() {
+ @Override
public void run() {
Set<String> keys = archetypesMap.keySet();
knownArchetypes.removeAll();
Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/NewSlingBundleWizard.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/NewSlingBundleWizard.java?rev=1770537&r1=1770536&r2=1770537&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/NewSlingBundleWizard.java (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/NewSlingBundleWizard.java Sun Nov 20 08:50:21 2016
@@ -28,12 +28,6 @@ public class NewSlingBundleWizard extend
}
@Override
- public void installArchetypes() {
-
- // rely on public archetypes only
- }
-
- @Override
public boolean acceptsArchetype(Archetype archetype) {
boolean isSlingBundleArchetype = archetype.getGroupId().equals("org.apache.sling") &&