Author: rombert
Date: Wed May 21 10:17:41 2014
New Revision: 1596530
URL: http://svn.apache.org/r1596530
Log:
SLING-3136 - Configure -> Convert to Bundle/Content Package project
should not assume the project is Maven-based
ConvertToBundleAction now considers all Java projects as candidates,
excluding the ones which already have the sling.bundle facet.
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ProjectHelper.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToBundleAction.java
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ProjectHelper.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ProjectHelper.java?rev=1596530&r1=1596529&r2=1596530&view=diff
==============================================================================
---
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ProjectHelper.java
(original)
+++
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ProjectHelper.java
Wed May 21 10:17:41 2014
@@ -47,8 +47,13 @@ public class ProjectHelper {
private static final String[] CONTENT_PACKAGE_STRUCTURE_BASE = new
String[] { "/", "/content", "/src/main/content" };
public static boolean isPotentialBundleProject(IProject project) {
- String packaging = getMavenProperty(project, "packaging");
- return (packaging!=null && "bundle".equals(packaging));
+
+ try {
+ return !isBundleProject(project) &&
project.getDescription().hasNature(JavaCore.NATURE_ID);
+ } catch (CoreException e) {
+ Activator.getDefault().getPluginLogger().warn("Failed getting
project description", e);
+ return false;
+ }
}
public static boolean isPotentialContentProject(IProject project) {
@@ -100,20 +105,16 @@ public class ProjectHelper {
}
}
} catch (ParserConfigurationException e) {
- //TODO proper logging
- e.printStackTrace();
+ Activator.getDefault().getPluginLogger().warn("Failed getting
maven property for " + project.getName(), e);
return null;
} catch (SAXException e) {
- //TODO proper logging
- e.printStackTrace();
+ Activator.getDefault().getPluginLogger().warn("Failed getting
maven property for " + project.getName(), e);
return null;
} catch (IOException e) {
- //TODO proper logging
- e.printStackTrace();
+ Activator.getDefault().getPluginLogger().warn("Failed getting
maven property for " + project.getName(), e);
return null;
} catch (CoreException e) {
- //TODO proper logging
- e.printStackTrace();
+ Activator.getDefault().getPluginLogger().warn("Failed getting
maven property for " + project.getName(), e);
return null;
}
return null;
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToBundleAction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToBundleAction.java?rev=1596530&r1=1596529&r2=1596530&view=diff
==============================================================================
---
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToBundleAction.java
(original)
+++
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToBundleAction.java
Wed May 21 10:17:41 2014
@@ -66,7 +66,7 @@ public class ConvertToBundleAction imple
IProject[] allProjects =
ResourcesPlugin.getWorkspace().getRoot().getProjects();
for (int i = 0; i < allProjects.length; i++) {
IProject p = allProjects[i];
- if (p.isOpen() &&
!ProjectHelper.isBundleProject(p) && ProjectHelper.isPotentialBundleProject(p))
{
+ if (p.isOpen() && ProjectHelper.isPotentialBundleProject(p)) {
applicableProjects.add(p);
}
}
@@ -90,8 +90,7 @@ public class ConvertToBundleAction imple
}
ConvertProjectsWizard wizard = new
ConvertProjectsWizard(applicableProjects, initialSelection,
- "Convert Project(s) to Sling/OSGi
Bundle(s)",
- "Select project(s) to convert to
Sling/OSGi bundle project(s)");
+ "Convert to Sling Bundle Project(s)", "Select project(s)
to convert to Sling Bundle project(s)");
final Display display = getDisplay();
final WizardDialog dialog = new
WizardDialog(display.getActiveShell(), wizard);
