You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/06/09 18:16:53 UTC
[1/2] ant-ivyde git commit: Simplify code
Repository: ant-ivyde
Updated Branches:
refs/heads/master 2d31e6608 -> f16c20ba4
Simplify code
Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/4490bc3f
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/4490bc3f
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/4490bc3f
Branch: refs/heads/master
Commit: 4490bc3fc89373e9a7f4e1136d6c62d519a0b691
Parents: 2d31e66
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sat Jun 9 19:33:32 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sat Jun 9 20:11:18 2018 +0200
----------------------------------------------------------------------
.../ResolveVisualizerForm.java | 3 +-
.../completion/IvyCodeCompletionProcessor.java | 3 +-
.../ivyde/common/ivyfile/IvyFileUpdater.java | 11 +++---
.../common/ivyfile/IvyModuleDescriptorFile.java | 8 +++--
.../ivyfile/IvyModuleDescriptorModel.java | 4 +--
.../common/ivysettings/IvySettingsFile.java | 3 +-
.../org/apache/ivyde/common/model/IvyFile.java | 6 ++--
.../org/apache/ivyde/common/model/IvyTag.java | 21 ++++++-----
.../eclipse/cp/IvyClasspathContainerHelper.java | 7 ++--
.../ivyde/internal/eclipse/CachedIvy.java | 38 ++++++++++----------
.../IvyClasspathContainerConfAdapter.java | 6 ++--
.../IvyClasspathContainerMapper.java | 10 +++---
.../eclipse/cpcontainer/IvydeContainerPage.java | 2 +-
.../eclipse/handlers/AddIvyNatureHandler.java | 14 ++++----
.../handlers/RemoveIvyNatureHandler.java | 18 +++++-----
.../internal/eclipse/resolve/IvyResolver.java | 26 +++++++-------
.../ui/views/ReverseDependencyExplorerView.java | 4 +--
.../workspaceresolver/WorkspaceResolver.java | 3 +-
18 files changed, 90 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/4490bc3f/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/ResolveVisualizerForm.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/ResolveVisualizerForm.java b/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/ResolveVisualizerForm.java
index d0eccfc..20fccd5 100644
--- a/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/ResolveVisualizerForm.java
+++ b/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/ResolveVisualizerForm.java
@@ -304,11 +304,10 @@ public class ResolveVisualizerForm {
public void widgetSelected(SelectionEvent e) {
if (evictionFilterEnablement.getSelection()) {
evictionFilter.setEnabled(true);
- view.refresh();
} else {
evictionFilter.setEnabled(false);
- view.refresh();
}
+ view.refresh();
}
});
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/4490bc3f/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/completion/IvyCodeCompletionProcessor.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/completion/IvyCodeCompletionProcessor.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/completion/IvyCodeCompletionProcessor.java
index 9859e57..63fc433 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/completion/IvyCodeCompletionProcessor.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/completion/IvyCodeCompletionProcessor.java
@@ -188,9 +188,8 @@ public class IvyCodeCompletionProcessor {
if (root == null) {
errorMessage = "parent tag :" + parent + " not found in model:";
return;
- } else {
- childs = root.getChilds();
}
+ childs = root.getChilds();
} else {
childs = Collections.singletonList(model.getRootIvyTag());
}
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/4490bc3f/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileUpdater.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileUpdater.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileUpdater.java
index de3cd78..e59522c 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileUpdater.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileUpdater.java
@@ -222,25 +222,27 @@ public class IvyFileUpdater {
while (matcher.find(index + 1)) {
if (matcher.end() > end) {
return index;
- } else {
- index = matcher.end();
}
+
+ index = matcher.end();
}
return index;
}
private int findStartOfBlock(String content, int index) {
- for (index--; index >= 0; index--) {
+ index--;
+ while (index >= 0) {
char c = content.charAt(index);
if (c != ' ' && c != '\t') {
return index + 1;
}
+ index--;
}
return 0;
}
private int findEndOfBlock(String content, int index) {
- for (; index < content.length(); index++) {
+ while (index < content.length()) {
char c = content.charAt(index);
if (c != ' ' && c != '\t') {
if (c == '\n' || c == '\r') {
@@ -248,6 +250,7 @@ public class IvyFileUpdater {
}
return index;
}
+ index++;
}
return index - 1;
}
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/4490bc3f/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorFile.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorFile.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorFile.java
index 16268aa..ebd3ca9 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorFile.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorFile.java
@@ -55,13 +55,15 @@ public class IvyModuleDescriptorFile extends IvyFile {
}
m = CONF_PATTERN.matcher(getDoc());
List<String> ret = new ArrayList<>();
- for (boolean found = m.find(start); found && m.end() < end; found = m.find()) {
+ boolean found = m.find(start);
+ while (found && m.end() < end) {
ret.add(m.group(1));
+ found = m.find();
}
return ret.toArray(new String[ret.size()]);
- } else {
- return new String[] {"default"};
}
+
+ return new String[] {"default"};
}
public String getOrganisation() {
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/4490bc3f/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java
index db89ce8..e9515ec 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java
@@ -307,9 +307,8 @@ public class IvyModuleDescriptorModel extends IvyModel {
if (r == null) { // listing can be used even for extra attributes
List<String> ret = listDependencyTokenValues(att, ivyfile);
return ret.toArray(new String[ret.size()]);
- } else {
- return r;
}
+ return r;
}
};
IvyTagAttribute orgAtt = new IvyTagAttribute("org",
@@ -389,7 +388,6 @@ public class IvyModuleDescriptorModel extends IvyModel {
branch, otherAttValues.remove("rev"), otherAttValues,
qualifier, base, arrowIndex);
}
-
} else {
// we are looking for a master conf
return getMasterConfs(ivyFile, qualifier, base, arrowIndex);
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/4490bc3f/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsFile.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsFile.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsFile.java
index 8636859..cde6def 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsFile.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsFile.java
@@ -34,6 +34,7 @@ import org.apache.ivy.core.IvyPatternHelper;
import org.apache.ivy.core.settings.XmlSettingsParser;
import org.apache.ivyde.common.model.IvyFile;
import org.apache.ivyde.common.model.IvyModelSettings;
+import org.apache.ivyde.internal.eclipse.IvyPlugin;
public class IvySettingsFile extends IvyFile {
private static final Pattern CLASSPATH_URL_PATTERN = Pattern
@@ -102,7 +103,7 @@ public class IvySettingsFile extends IvyFile {
p.load(XmlSettingsParser.class.getResourceAsStream("typedef.properties"));
} catch (IOException e) {
// TODO Auto-generated catch block
- e.printStackTrace();
+ IvyPlugin.logError(e.getMessage(), e);
}
return p;
}
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/4490bc3f/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyFile.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyFile.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyFile.java
index 88273f7..4ea1195 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyFile.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyFile.java
@@ -318,10 +318,8 @@ public abstract class IvyFile {
+ closedName.length()))) {
stack.pop();
}
- } else {
- if (parentEndTagReached) {
- return new int[] {offset + 1, lastSpaceIndex};
- }
+ } else if (parentEndTagReached) {
+ return new int[]{offset + 1, lastSpaceIndex};
}
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/4490bc3f/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTag.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTag.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTag.java
index 2589da5..67b4da2 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTag.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTag.java
@@ -103,11 +103,11 @@ public class IvyTag {
}
public String getEndTag() {
- if (getChilds().size() > 0) {
- return "</" + getName() + ">";
- } else {
+ if (getChilds().size() == 0) {
return "/>";
}
+
+ return "</" + getName() + ">";
}
public String getStartTag() {
@@ -126,10 +126,11 @@ public class IvyTag {
}
public String getId() {
- if (getParent() != null) {
- return getParent().getId() + "." + getName();
+ if (getParent() == null) {
+ return getName();
}
- return getName();
+
+ return getParent().getId() + "." + getName();
}
public void setDoc(String doc) {
@@ -154,7 +155,9 @@ public class IvyTag {
return null;
}
IValueProvider provider = ivyTagAttribute.getValueProvider();
- if (provider != null) {
+ if (provider == null) {
+ System.out.println("No provider set for:" + att);
+ } else {
String qualifier = ivyfile.getAttributeValueQualifier();
String[] values = provider.getValuesfor(ivyTagAttribute, ivyfile);
if (values != null) {
@@ -165,11 +168,7 @@ public class IvyTag {
}
}
return ret.toArray(new String[ret.size()]);
- } else {
- return null;
}
- } else {
- System.out.println("No provider set for:" + att);
}
return null;
}
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/4490bc3f/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/IvyClasspathContainerHelper.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/IvyClasspathContainerHelper.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/IvyClasspathContainerHelper.java
index 0d64c52..a52a5a0 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/IvyClasspathContainerHelper.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/IvyClasspathContainerHelper.java
@@ -196,10 +196,9 @@ public final class IvyClasspathContainerHelper {
}
try {
for (IClasspathEntry entry : javaProject.getRawClasspath()) {
- if (entry != null && entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
- if (containerPath.equals(entry.getPath())) {
- return entry;
- }
+ if (entry != null && entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER
+ && containerPath.equals(entry.getPath())) {
+ return entry;
}
}
} catch (JavaModelException e) {
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/4490bc3f/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/CachedIvy.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/CachedIvy.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/CachedIvy.java
index ae54c64..3932aca 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/CachedIvy.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/CachedIvy.java
@@ -159,25 +159,25 @@ public abstract class CachedIvy {
// before returning the found ivy, try to refresh it if the settings changed
if (settingsPath.getFile() != null) {
return getIvyFromFile(settingsPath);
- } else {
- // an URL but not a file
- if (ivy == null || ivySettingsLastModified == -1) {
- IvySettings ivySettings = createIvySettings();
- ivy = Ivy.newInstance(ivySettings);
- try {
- ivy.configure(settingsPath.getUrl());
- ivySettingsLastModified = 0;
- } catch (ParseException e) {
- ivy = null;
- throw new IvyDEException("Parsing error of the Ivy settings",
- "The ivy settings file '" + settingsPath.getResolvedPath()
- + "' could not be parsed: " + e.getMessage(), e);
- } catch (IOException e) {
- ivy = null;
- throw new IvyDEException("Read error of the Ivy settings",
- "The ivy settings file '" + settingsPath.getResolvedPath()
- + "' could not be read: " + e.getMessage(), e);
- }
+ }
+
+ // an URL but not a file
+ if (ivy == null || ivySettingsLastModified == -1) {
+ IvySettings ivySettings = createIvySettings();
+ ivy = Ivy.newInstance(ivySettings);
+ try {
+ ivy.configure(settingsPath.getUrl());
+ ivySettingsLastModified = 0;
+ } catch (ParseException e) {
+ ivy = null;
+ throw new IvyDEException("Parsing error of the Ivy settings",
+ "The ivy settings file '" + settingsPath.getResolvedPath()
+ + "' could not be parsed: " + e.getMessage(), e);
+ } catch (IOException e) {
+ ivy = null;
+ throw new IvyDEException("Read error of the Ivy settings",
+ "The ivy settings file '" + settingsPath.getResolvedPath()
+ + "' could not be read: " + e.getMessage(), e);
}
}
return ivy;
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/4490bc3f/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java
index 1a26aad..19511d3 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java
@@ -320,15 +320,15 @@ public final class IvyClasspathContainerConfAdapter {
retrieveSetups = manager.getSetup(project);
} catch (IOException e) {
// TODO Auto-generated catch block
- e.printStackTrace();
+ IvyPlugin.logError(e.getMessage(), e);
return;
}
retrieveSetups.add(setup);
try {
manager.save(project, retrieveSetups);
- } catch (Exception e) {
+ } catch (IOException e) {
// TODO Auto-generated catch block
- e.printStackTrace();
+ IvyPlugin.logError(e.getMessage(), e);
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/4490bc3f/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerMapper.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerMapper.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerMapper.java
index f6cde60..37a74cf 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerMapper.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerMapper.java
@@ -126,8 +126,11 @@ public class IvyClasspathContainerMapper {
IvyDEMessage.verbose("Adding " + artifact.getName() + " to the classpath");
// handle unzipped jar with 'Bundle-Classpath'
- if (osgiClasspathAvailable && artifact.getLocalFile().isDirectory()
- && classpathSetup.isReadOSGiMetadata()) {
+ if (!osgiClasspathAvailable || !artifact.getLocalFile().isDirectory()
+ || !classpathSetup.isReadOSGiMetadata()) {
+ // simple entry
+ paths.add(buildEntry(artifact));
+ } else {
File manifestFile = new File(artifact.getLocalFile(), "META-INF/MANIFEST.MF");
if (!manifestFile.exists()) {
// no manifest : back to simple classpath
@@ -160,9 +163,6 @@ public class IvyClasspathContainerMapper {
+ ")", e);
}
}
- } else {
- // simple entry
- paths.add(buildEntry(artifact));
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/4490bc3f/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvydeContainerPage.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvydeContainerPage.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvydeContainerPage.java
index 5d9f700..a46c270 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvydeContainerPage.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvydeContainerPage.java
@@ -144,7 +144,7 @@ public class IvydeContainerPage extends NewElementWizardPage implements IClasspa
IvyClasspathContainerConfiguration cpc = container.getConf();
// first check that this is not the one we are editing
- if (oldIvyFile != null && cpc.getIvyXmlPath().equals(oldIvyFile) && oldConfs != null
+ if (cpc.getIvyXmlPath().equals(oldIvyFile) && oldConfs != null
&& oldConfs.size() == cpc.getConfs().size()
&& oldConfs.containsAll(cpc.getConfs())) {
continue;
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/4490bc3f/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/AddIvyNatureHandler.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/AddIvyNatureHandler.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/AddIvyNatureHandler.java
index 5041f76..6dab7ac 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/AddIvyNatureHandler.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/AddIvyNatureHandler.java
@@ -40,16 +40,14 @@ public class AddIvyNatureHandler extends AbstractHandler {
List<IProject> projects = new LinkedList<>();
for (Object object : ((IStructuredSelection) selection).toList()) {
- if (object instanceof IAdaptable) {
- IProject project = (IProject) ((IAdaptable) object).getAdapter(IProject.class);
- if (project != null) {
- projects.add(project);
- } else {
- return null;
- }
- } else {
+ if (!(object instanceof IAdaptable)) {
return null;
}
+ IProject project = (IProject) ((IAdaptable) object).getAdapter(IProject.class);
+ if (project == null) {
+ return null;
+ }
+ projects.add(project);
}
if (projects.size() > 0) {
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/4490bc3f/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/RemoveIvyNatureHandler.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/RemoveIvyNatureHandler.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/RemoveIvyNatureHandler.java
index 18dc9e3..9906ef9 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/RemoveIvyNatureHandler.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/RemoveIvyNatureHandler.java
@@ -45,18 +45,16 @@ public class RemoveIvyNatureHandler extends AbstractHandler {
List<IProject> projects = new LinkedList<>();
for (Object object : ((IStructuredSelection) selection).toList()) {
- if (object instanceof IAdaptable) {
- IProject project = (IProject) ((IAdaptable) object).getAdapter(IProject.class);
- if (project != null) {
- if (IvyNatureHelper.hasNature(project)) {
- projects.add(project);
- }
- } else {
- return null;
- }
- } else {
+ if (!(object instanceof IAdaptable)) {
+ return null;
+ }
+ IProject project = (IProject) ((IAdaptable) object).getAdapter(IProject.class);
+ if (project == null) {
return null;
}
+ if (IvyNatureHelper.hasNature(project)) {
+ projects.add(project);
+ }
}
if (projects.size() > 0) {
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/4490bc3f/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java
index 42c9c2b..7dddf15 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java
@@ -222,19 +222,19 @@ public class IvyResolver {
IvyDEMessage.info("The resolve report for the configuration " + conf
+ " was not found. Falling back by doing a resolve again.");
return doResolve(ivy, md);
- } else {
- IvyDEMessage.verbose("Resolve report found, parsing it");
- // found a report, try to parse it.
- try {
- XmlReportParser parser = new XmlReportParser();
- parser.parse(report);
- result.addArtifactReports(parser.getArtifactReports());
- findAllArtifactOnRefresh(ivy, parser, result);
- } catch (ParseException e) {
- IvyDEMessage.info("Error while parsing the report " + report
- + ". Falling back by doing a resolve again.");
- return doResolve(ivy, md);
- }
+ }
+
+ IvyDEMessage.verbose("Resolve report found, parsing it");
+ // found a report, try to parse it.
+ try {
+ XmlReportParser parser = new XmlReportParser();
+ parser.parse(report);
+ result.addArtifactReports(parser.getArtifactReports());
+ findAllArtifactOnRefresh(ivy, parser, result);
+ } catch (ParseException e) {
+ IvyDEMessage.info("Error while parsing the report " + report
+ + ". Falling back by doing a resolve again.");
+ return doResolve(ivy, md);
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/4490bc3f/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReverseDependencyExplorerView.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReverseDependencyExplorerView.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReverseDependencyExplorerView.java
index 51f2e99..931b42a 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReverseDependencyExplorerView.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReverseDependencyExplorerView.java
@@ -312,9 +312,9 @@ public class ReverseDependencyExplorerView extends ViewPart {
if (mrdd.hasMultipleRevisions() && !mrdd.hasNewRevision()) {
return sharedImages.getImage(ISharedImages.IMG_OBJS_WARN_TSK);
- } else {
- return IvyPlugin.getImageDescriptor("icons/synced.gif").createImage();
}
+
+ return IvyPlugin.getImageDescriptor("icons/synced.gif").createImage();
} else if (obj instanceof CPDependencyDescriptor) {
return JavaUI.getSharedImages().getImage(
org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_LIBRARY);
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/4490bc3f/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceResolver.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceResolver.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceResolver.java
index 7d17fd4..1f2267c 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceResolver.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceResolver.java
@@ -211,8 +211,7 @@ public class WorkspaceResolver extends AbstractResolver {
if (osgiResolveInWorkspaceAvailable && org.equals(BundleInfo.BUNDLE_TYPE)) {
// looking for an OSGi bundle via its symbolic name
- String sn = md.getExtraInfoContentByTagName("Bundle-SymbolicName");
- if (sn == null || !module.equals(sn)) {
+ if (!module.equals(md.getExtraInfoContentByTagName("Bundle-SymbolicName"))) {
// not found, skip to next
continue;
}
[2/2] ant-ivyde git commit: Use try with resources
Posted by gi...@apache.org.
Use try with resources
Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/f16c20ba
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/f16c20ba
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/f16c20ba
Branch: refs/heads/master
Commit: f16c20ba410794da729bab36cd42786887de1219
Parents: 4490bc3
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sat Jun 9 20:16:34 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sat Jun 9 20:16:34 2018 +0200
----------------------------------------------------------------------
.../cpcontainer/IvyAttachmentManager.java | 26 ++-----------
.../IvyClasspathContainerSerializer.java | 40 ++++++--------------
.../eclipse/retrieve/RetrieveSetupManager.java | 23 +++--------
3 files changed, 20 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f16c20ba/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyAttachmentManager.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyAttachmentManager.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyAttachmentManager.java
index 0fac246..107d5dd 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyAttachmentManager.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyAttachmentManager.java
@@ -54,17 +54,8 @@ public class IvyAttachmentManager {
return;
}
IvyDEMessage.verbose("Reading attachment properties");
- try {
- FileInputStream in = new FileInputStream(containersAttachmentFile);
- try {
- prop.load(in);
- } finally {
- try {
- in.close();
- } catch (IOException e) {
- // don't care
- }
- }
+ try (FileInputStream in = new FileInputStream(containersAttachmentFile)) {
+ prop.load(in);
} catch (IOException ioe) {
IvyPlugin.logWarn("IvyDE attachment properties could not be loaded", ioe);
}
@@ -127,17 +118,8 @@ public class IvyAttachmentManager {
// store the global result
IvyDEMessage.verbose("Saving attachment properties");
- try {
- FileOutputStream out = new FileOutputStream(containersAttachmentFile);
- try {
- prop.store(out, "");
- } finally {
- try {
- out.close();
- } catch (IOException e) {
- // don't care
- }
- }
+ try (FileOutputStream out = new FileOutputStream(containersAttachmentFile)) {
+ prop.store(out, "");
} catch (IOException ioe) {
IvyPlugin.logWarn("IvyDE attachment properties could not be saved", ioe);
}
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f16c20ba/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerSerializer.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerSerializer.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerSerializer.java
index 20ab071..62b0575 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerSerializer.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerSerializer.java
@@ -103,21 +103,12 @@ public class IvyClasspathContainerSerializer {
public void save(IJavaProject project) {
List<IvyClasspathContainer> containers = IvyClasspathContainerHelper
.getContainers(project);
- try {
- File file = new File(containersStateDir, project.getProject().getName() + ".xml");
- IvyDEMessage.verbose("Saving the state of the containers of the project "
- + project.getProject().getName() + " into " + file);
- FileOutputStream out = new FileOutputStream(file);
- try {
- write(out, containers);
- } finally {
- try {
- out.close();
- } catch (IOException e) {
- // don't care
- }
- }
- } catch (Exception ioe) {
+ File file = new File(containersStateDir, project.getProject().getName() + ".xml");
+ IvyDEMessage.verbose("Saving the state of the containers of the project "
+ + project.getProject().getName() + " into " + file);
+ try (FileOutputStream out = new FileOutputStream(file)) {
+ write(out, containers);
+ } catch (IOException ioe) {
IvyPlugin.logWarn("IvyDE container states of the project "
+ project.getProject().getName() + " could not be saved", ioe);
}
@@ -132,18 +123,9 @@ public class IvyClasspathContainerSerializer {
+ project.getProject().getName() + " doesn't exist.");
return null;
}
- try {
- FileInputStream in = new FileInputStream(file);
- try {
- return read(in);
- } finally {
- try {
- in.close();
- } catch (IOException e) {
- // don't care
- }
- }
- } catch (Exception ioe) {
+ try (FileInputStream in = new FileInputStream(file)) {
+ return read(in);
+ } catch (IOException | SAXException ioe) {
IvyPlugin.logWarn("IvyDE container states of the project "
+ project.getProject().getName() + " could not be read", ioe);
return null;
@@ -317,8 +299,8 @@ public class IvyClasspathContainerSerializer {
}
}
- IvyClasspathContainerImpl ivycp = new IvyClasspathContainerImpl(project, path, cpEntries,
- cpAttributes);
+ IvyClasspathContainerImpl ivycp = new IvyClasspathContainerImpl(project, path,
+ cpEntries, cpAttributes);
containers.put(path, ivycp);
}
return containers;
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f16c20ba/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/retrieve/RetrieveSetupManager.java
----------------------------------------------------------------------
diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/retrieve/RetrieveSetupManager.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/retrieve/RetrieveSetupManager.java
index ee54e4c..a393db3 100644
--- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/retrieve/RetrieveSetupManager.java
+++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/retrieve/RetrieveSetupManager.java
@@ -59,35 +59,22 @@ public class RetrieveSetupManager implements ISaveParticipant {
List<StandaloneRetrieveSetup> retrieveSetups;
StandaloneRetrieveSerializer serializer = new StandaloneRetrieveSerializer();
- ByteArrayInputStream in = new ByteArrayInputStream(retrieveSetup.getBytes());
- try {
+ try (ByteArrayInputStream in = new ByteArrayInputStream(retrieveSetup.getBytes())) {
retrieveSetups = serializer.read(in, project);
- } finally {
- try {
- in.close();
- } catch (IOException e) {
- // we don't care
- }
}
+ // we don't care
return retrieveSetups;
}
public void save(final IProject project, List<StandaloneRetrieveSetup> retrieveSetups)
throws IOException {
StandaloneRetrieveSerializer serializer = new StandaloneRetrieveSerializer();
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- try {
+ final String retrieveSetup;
+ try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
serializer.write(out, retrieveSetups);
- } finally {
- try {
- out.close();
- } catch (IOException e) {
- // we don't care
- }
+ retrieveSetup = new String(out.toByteArray());
}
- final String retrieveSetup = new String(out.toByteArray());
-
synchronized (projectPrefs) {
IEclipsePreferences pref = projectPrefs.get(project);
if (pref == null) {