You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2013/09/12 17:47:54 UTC
svn commit: r1522633 - in
/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards:
ConvertToContentPackageAction.java MavenHelper.java
Author: stefanegli
Date: Thu Sep 12 15:47:54 2013
New Revision: 1522633
URL: http://svn.apache.org/r1522633
Log:
SLING-3030 : prepare support for batch-conversion to sling.content projects
Removed:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/MavenHelper.java
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java?rev=1522633&r1=1522632&r2=1522633&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java Thu Sep 12 15:47:54 2013
@@ -17,8 +17,8 @@
package org.apache.sling.ide.eclipse.ui.wizards;
import java.lang.reflect.InvocationTargetException;
+import java.util.Iterator;
-import org.apache.maven.model.Model;
import org.apache.sling.ide.eclipse.core.ConfigurationHelper;
import org.apache.sling.ide.eclipse.core.internal.ProjectHelper;
import org.eclipse.core.resources.IProject;
@@ -114,26 +114,30 @@ public class ConvertToContentPackageActi
fSelection = selection;
if (selection instanceof IStructuredSelection) {
final IStructuredSelection iss = (IStructuredSelection) selection;
- if (iss.toList().size()!=1) {
+ Iterator<Object> it = iss.iterator();
+ if (!it.hasNext()) {
action.setEnabled(false);
- } else {
- Object firstElement = iss.getFirstElement();
- if (firstElement!=null && (firstElement instanceof IProject)) {
- final IProject project = (IProject) firstElement;
+ return;
+ }
+ while(it.hasNext()) {
+ Object elem = it.next();
+ if (elem!=null && (elem instanceof IProject)) {
+ final IProject project = (IProject) elem;
if (ProjectHelper.isContentProject(project)) {
action.setEnabled(false);
+ return;
+ } else if (ProjectHelper.isPotentialContentProject(project)) {
+ continue;
} else {
- Model mavenModel = MavenHelper.getMavenModel(project);
- if (mavenModel!=null && "content-package".equals(mavenModel.getPackaging())) {
- action.setEnabled(true);
- } else {
- action.setEnabled(false);
- }
+ action.setEnabled(false);
+ return;
}
} else {
action.setEnabled(false);
+ return;
}
}
+ action.setEnabled(true);
} else {
action.setEnabled(false);
}