Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2015-12-23 19:54:49 +0000
committerRyan D. Brooks2015-12-23 19:54:49 +0000
commit82b1c027fa407dcdeaae4676c91681e3cdd9fa6c (patch)
tree2c235ec876df29269b683ed69ecf2ef432375ec9 /plugins/org.eclipse.osee.config.admin
parentad0d071519a7e37e8d6f81906c4c9690a3de3a31 (diff)
downloadorg.eclipse.osee-82b1c027fa407dcdeaae4676c91681e3cdd9fa6c.tar.gz
org.eclipse.osee-82b1c027fa407dcdeaae4676c91681e3cdd9fa6c.tar.xz
org.eclipse.osee-82b1c027fa407dcdeaae4676c91681e3cdd9fa6c.zip
refinement: Re-Organize, Format and Cleanup source
Diffstat (limited to 'plugins/org.eclipse.osee.config.admin')
-rw-r--r--plugins/org.eclipse.osee.config.admin/src/org/eclipse/osee/config/admin/internal/ConfigManagerConfigurationBuilder.java6
-rw-r--r--plugins/org.eclipse.osee.config.admin/src/org/eclipse/osee/config/admin/internal/ConfigParser.java20
2 files changed, 5 insertions, 21 deletions
diff --git a/plugins/org.eclipse.osee.config.admin/src/org/eclipse/osee/config/admin/internal/ConfigManagerConfigurationBuilder.java b/plugins/org.eclipse.osee.config.admin/src/org/eclipse/osee/config/admin/internal/ConfigManagerConfigurationBuilder.java
index b8d82a1f403..6c5c03a6579 100644
--- a/plugins/org.eclipse.osee.config.admin/src/org/eclipse/osee/config/admin/internal/ConfigManagerConfigurationBuilder.java
+++ b/plugins/org.eclipse.osee.config.admin/src/org/eclipse/osee/config/admin/internal/ConfigManagerConfigurationBuilder.java
@@ -138,9 +138,9 @@ public class ConfigManagerConfigurationBuilder {
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((configUri == null) ? 0 : configUri.hashCode());
- result = prime * result + (int) (pollTime ^ (pollTime >>> 32));
- result = prime * result + ((pollTimeUnit == null) ? 0 : pollTimeUnit.hashCode());
+ result = prime * result + (configUri == null ? 0 : configUri.hashCode());
+ result = prime * result + (int) (pollTime ^ pollTime >>> 32);
+ result = prime * result + (pollTimeUnit == null ? 0 : pollTimeUnit.hashCode());
return result;
}
diff --git a/plugins/org.eclipse.osee.config.admin/src/org/eclipse/osee/config/admin/internal/ConfigParser.java b/plugins/org.eclipse.osee.config.admin/src/org/eclipse/osee/config/admin/internal/ConfigParser.java
index 3f3bc690507..6e8b16909f8 100644
--- a/plugins/org.eclipse.osee.config.admin/src/org/eclipse/osee/config/admin/internal/ConfigParser.java
+++ b/plugins/org.eclipse.osee.config.admin/src/org/eclipse/osee/config/admin/internal/ConfigParser.java
@@ -22,24 +22,8 @@ import org.osgi.framework.Constants;
* Parses JSON String with the following format:
*
* <pre>
- * {
- * "config":
- * [
- * {
- * "service.pid": "service-1",
- * "key1": "val1",
- * "key2": "val2"
- * },
- * {
- * "service.pid": "service-2",
- * "a": "34242",
- * "b": "hello"
- * },
- * {
- * "service.pid": "service-3"
- * }
- * ]
- * };
+ * { "config": [ { "service.pid": "service-1", "key1": "val1", "key2": "val2" }, { "service.pid": "service-2", "a":
+ * "34242", "b": "hello" }, { "service.pid": "service-3" } ] };
*
* <pre/>
*

Back to the top