Author: bbrodt Date: 2011-02-18 17:07:37 -0500 (Fri, 18 Feb 2011) New Revision: 29249 Modified: workspace/bbrodt/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF workspace/bbrodt/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementPlacer.java workspace/bbrodt/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDComparer.java workspace/bbrodt/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF workspace/bbrodt/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableInitializationSection.java Log: make sure everything actually compiles with J2SE-1.5, like it sez in the plugin manifest Modified: workspace/bbrodt/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF =================================================================== --- workspace/bbrodt/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF 2011-02-18 21:20:45 UTC (rev 29248) +++ workspace/bbrodt/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF 2011-02-18 22:07:37 UTC (rev 29249) @@ -28,5 +28,5 @@ Bundle-Activator: org.eclipse.bpel.apache.ode.runtime.OdePlugin Export-Package: org.eclipse.bpel.apache.ode.runtime Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.eclipse.bpel.runtimes Modified: workspace/bbrodt/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementPlacer.java =================================================================== --- workspace/bbrodt/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementPlacer.java 2011-02-18 21:20:45 UTC (rev 29248) +++ workspace/bbrodt/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementPlacer.java 2011-02-18 22:07:37 UTC (rev 29249) @@ -227,7 +227,7 @@ boolean textNodeIsWhitespaceOnly = false; if (nextInnerChild instanceof Text) { String content = ((Text)nextInnerChild).getData(); - textNodeIsWhitespaceOnly = (content==null || content.trim().isEmpty()); + textNodeIsWhitespaceOnly = (content==null || "".equals(content.trim())); } if (textNodeIsWhitespaceOnly) { // remove an old indentation Modified: workspace/bbrodt/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDComparer.java =================================================================== --- workspace/bbrodt/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDComparer.java 2011-02-18 21:20:45 UTC (rev 29248) +++ workspace/bbrodt/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDComparer.java 2011-02-18 22:07:37 UTC (rev 29249) @@ -351,7 +351,7 @@ type = type.getBaseType(); } while (!names.isEmpty()) { - if (s.isEmpty()) + if ("".equals(s)) s = names.pop(); else s = s + ":" + names.pop(); @@ -369,8 +369,8 @@ return false; } if (name1.equals(name2)) { - if (elem1.getTargetNamespace() == null || elem1.getTargetNamespace().isEmpty() - && elem2.getTargetNamespace() == null || elem2.getTargetNamespace().isEmpty()) + if (elem1.getTargetNamespace() == null || "".equals(elem1.getTargetNamespace()) + && elem2.getTargetNamespace() == null || "".equals(elem2.getTargetNamespace())) return true; if (elem1.getTargetNamespace().equals(elem2.getTargetNamespace())) @@ -447,7 +447,7 @@ public int getMinOccurs(XSDTerm term) { String smin = term.getElement().getAttribute("minOccurs"); int min = 1; - if (smin!=null && !smin.isEmpty()) { + if (smin!=null && !"".equals(smin)) { try { min = Integer.parseInt(smin); } catch (NumberFormatException e) { @@ -465,7 +465,7 @@ public int getMaxOccurs(XSDTerm term) { String smax = term.getElement().getAttribute("maxOccurs"); int max = 1; - if (smax!=null && !smax.isEmpty()) { + if (smax!=null && !"".equals(smax)) { try { max = Integer.parseInt(smax); } catch (NumberFormatException e) { Modified: workspace/bbrodt/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF =================================================================== --- workspace/bbrodt/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF 2011-02-18 21:20:45 UTC (rev 29248) +++ workspace/bbrodt/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF 2011-02-18 22:07:37 UTC (rev 29249) @@ -30,4 +30,4 @@ org.eclipse.bpel.runtimes.publishers, org.eclipse.bpel.runtimes.ui.wizards Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: workspace/bbrodt/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableInitializationSection.java =================================================================== --- workspace/bbrodt/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableInitializationSection.java 2011-02-18 21:20:45 UTC (rev 29248) +++ workspace/bbrodt/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableInitializationSection.java 2011-02-18 22:07:37 UTC (rev 29249) @@ -293,7 +293,7 @@ From from = fVariable.getFrom(); if (from!=null) { String literal = from.getLiteral(); - if (literal==null || literal.isEmpty()) { + if (literal==null || "".equals(literal.trim())) { literal = createDefaultInitializer(getBPELEditor(), fVariable, null); from.setLiteral(literal); } @@ -350,7 +350,7 @@ String literal = EMPTY_STRING; if ( from!=null && to!=null) { literal = from.getLiteral(); - if (literal==null || literal.isEmpty()) { + if (literal==null || "".equals(literal.trim())) { literal = createDefaultInitializer(bpelEditor, to.getVariable(), to.getPart()); from.setLiteral(literal); }