Repository: ant-ivyde Updated Branches: refs/heads/master 5db6d3bcc -> 511bba124
Simplify Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/fd7fdd37 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/fd7fdd37 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/fd7fdd37 Branch: refs/heads/master Commit: fd7fdd37aa1582a600170b776cb83a9630d9e48f Parents: 5db6d3b Author: Gintas Grigelionis <[email protected]> Authored: Wed Mar 14 09:00:08 2018 +0100 Committer: Gintas Grigelionis <[email protected]> Committed: Wed Mar 14 09:00:08 2018 +0100 ---------------------------------------------------------------------- .../ivyde/eclipse/IvyDEsecurityHelper.java | 5 +--- .../apache/ivyde/eclipse/cp/SecuritySetup.java | 9 +------- .../internal/eclipse/resolve/IvyResolver.java | 3 +-- .../retrieve/StandaloneRetrieveSerializer.java | 24 ++++++++++++-------- .../MultiRevDependencyDescriptor.java | 7 ++---- .../internal/eclipse/ui/console/IvyConsole.java | 21 ++++++++++------- .../ui/views/ReverseDependencyExplorerView.java | 7 ++---- 7 files changed, 34 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/fd7fdd37/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEsecurityHelper.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEsecurityHelper.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEsecurityHelper.java index 08debaf..db683b1 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEsecurityHelper.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEsecurityHelper.java @@ -116,10 +116,7 @@ public final class IvyDEsecurityHelper { if (preferences.nodeExists(IVY_DE_CREDENTIALS_BASE_NODE)) { ISecurePreferences node = preferences.node(IVY_DE_CREDENTIALS_BASE_NODE); if (node.nodeExists(host)) { - ISecurePreferences childNode = node.node(host); - if (childNode.nodeExists(realm)) { - return true; - } + return node.node(host).nodeExists(realm); } } return false; http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/fd7fdd37/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/SecuritySetup.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/SecuritySetup.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/SecuritySetup.java index 2102f03..761faaa 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/SecuritySetup.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/SecuritySetup.java @@ -165,14 +165,7 @@ public class SecuritySetup implements Comparable<SecuritySetup> { } else if (!host.equals(other.host)) { return false; } - if (realm == null) { - if (other.realm != null) { - return false; - } - } else if (!realm.equals(other.realm)) { - return false; - } - return true; + return realm == null ? other.realm == null : realm.equals(other.realm); } @Override http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/fd7fdd37/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 7b22989..42c9c2b 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 @@ -196,8 +196,7 @@ public class IvyResolver { } private void computeConfs(List<String> confInput, ModuleDescriptor md) { - Set<String> configurations = new HashSet<>(); - configurations.addAll(confInput); + Set<String> configurations = new HashSet<>(confInput); if (configurations.contains("*")) { confs = md.getConfigurationsNames(); http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/fd7fdd37/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/retrieve/StandaloneRetrieveSerializer.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/retrieve/StandaloneRetrieveSerializer.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/retrieve/StandaloneRetrieveSerializer.java index 4c671d1..51d6985 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/retrieve/StandaloneRetrieveSerializer.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/retrieve/StandaloneRetrieveSerializer.java @@ -221,16 +221,20 @@ public class StandaloneRetrieveSerializer { NodeList children = node.getChildNodes(); for (int j = 0; j < children.getLength(); j++) { Node item = children.item(j); - if (item.getNodeName().equals(IVYSETTINGS)) { - SettingsSetup settingsSetup = readSettingsSetup(item); - setup.setSettingsSetup(settingsSetup); - setup.setSettingsProjectSpecific(true); - } else if (item.getNodeName().equals(IVYXML)) { - String ivyXmlPath = readIvyXmlPath(item); - setup.setIvyXmlPath(ivyXmlPath); - } else if (item.getNodeName().equals(RETRIEVE)) { - RetrieveSetup retrieveSetup = readRetrieveSetup(item); - setup.setRetrieveSetup(retrieveSetup); + switch (item.getNodeName()) { + case IVYSETTINGS: + SettingsSetup settingsSetup = readSettingsSetup(item); + setup.setSettingsSetup(settingsSetup); + setup.setSettingsProjectSpecific(true); + break; + case IVYXML: + String ivyXmlPath = readIvyXmlPath(item); + setup.setIvyXmlPath(ivyXmlPath); + break; + case RETRIEVE: + RetrieveSetup retrieveSetup = readRetrieveSetup(item); + setup.setRetrieveSetup(retrieveSetup); + break; } } http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/fd7fdd37/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/revdepexplorer/MultiRevDependencyDescriptor.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/revdepexplorer/MultiRevDependencyDescriptor.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/revdepexplorer/MultiRevDependencyDescriptor.java index 861e6b5..aa113c3 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/revdepexplorer/MultiRevDependencyDescriptor.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/revdepexplorer/MultiRevDependencyDescriptor.java @@ -46,12 +46,9 @@ public class MultiRevDependencyDescriptor { public boolean equals(Object o) { if (o instanceof MultiRevDependencyDescriptor) { MultiRevDependencyDescriptor mrdd = (MultiRevDependencyDescriptor) o; - - if (getOrganization().equals(mrdd.getOrganization()) + return getOrganization().equals(mrdd.getOrganization()) && getModule().equals(mrdd.getModule()) - && dependenciesByContainer.equals(mrdd.dependenciesByContainer)) { - return true; - } + && dependenciesByContainer.equals(mrdd.dependenciesByContainer); } return false; http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/fd7fdd37/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsole.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsole.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsole.java index 0f3a9c9..6626001 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsole.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsole.java @@ -223,14 +223,19 @@ public class IvyConsole extends MessageConsole implements MessageLogger { preference); if (rgb == PreferenceConverter.COLOR_DEFAULT_DEFAULT) { // CheckStyle:MagicNumber| OFF - if (PREF_CONSOLE_DEBUG_COLOR.equals(preference)) { - rgb = new RGB(180, 180, 255); - } else if (PREF_CONSOLE_VERBOSE_COLOR.equals(preference)) { - rgb = new RGB(50, 150, 50); - } else if (PREF_CONSOLE_WARN_COLOR.equals(preference)) { - rgb = new RGB(255, 80, 20); - } else if (PREF_CONSOLE_ERROR_COLOR.equals(preference)) { - rgb = new RGB(255, 0, 0); + switch (preference) { + case PREF_CONSOLE_DEBUG_COLOR: + rgb = new RGB(180, 180, 255); + break; + case PREF_CONSOLE_VERBOSE_COLOR: + rgb = new RGB(50, 150, 50); + break; + case PREF_CONSOLE_WARN_COLOR: + rgb = new RGB(255, 80, 20); + break; + case PREF_CONSOLE_ERROR_COLOR: + rgb = new RGB(255, 0, 0); + break; } // CheckStyle:MagicNumber| ON } http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/fd7fdd37/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 d992863..2d077f3 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 @@ -344,12 +344,9 @@ public class ReverseDependencyExplorerView extends ViewPart { } public boolean hasChildren(Object parent) { - if (parent instanceof MultiRevDependencyDescriptor) { + if ((parent instanceof MultiRevDependencyDescriptor)) { MultiRevDependencyDescriptor mrdd = (MultiRevDependencyDescriptor) parent; - - if (mrdd.getIvyClasspathContainers().length > 0) { - return true; - } + return mrdd.getIvyClasspathContainers().length > 0; } return false;
