Commit d9087ccc authored by Adam Knapp's avatar Adam Knapp Committed by Arpad Lovassy

Correcting & -> &&

Signed-off-by: Adam Knapp's avatarAdam Knapp <adam.knapp@ericsson.com>
parent cf50ae1c
...@@ -74,11 +74,7 @@ public final class ActivateDereferedExpression extends Expression_Value { ...@@ -74,11 +74,7 @@ public final class ActivateDereferedExpression extends Expression_Value {
@Override @Override
/** {@inheritDoc} */ /** {@inheritDoc} */
public boolean checkExpressionSelfReference(final CompilationTimeStamp timestamp, final Assignment lhs) { public boolean checkExpressionSelfReference(final CompilationTimeStamp timestamp, final Assignment lhs) {
if (value != null & value.checkExpressionSelfReferenceValue(timestamp, lhs)) { return value != null && value.checkExpressionSelfReferenceValue(timestamp, lhs);
return true;
}
return false;
} }
@Override @Override
......
...@@ -72,7 +72,7 @@ public final class IsTemplateKindExpression extends Expression_Value { ...@@ -72,7 +72,7 @@ public final class IsTemplateKindExpression extends Expression_Value {
if (templateInstance != null && templateInstance.getTemplateBody().checkExpressionSelfReferenceTemplate(timestamp, lhs)) { if (templateInstance != null && templateInstance.getTemplateBody().checkExpressionSelfReferenceTemplate(timestamp, lhs)) {
return true; return true;
} }
if (value != null & value.checkExpressionSelfReferenceValue(timestamp, lhs)) { if (value != null && value.checkExpressionSelfReferenceValue(timestamp, lhs)) {
return true; return true;
} }
......
...@@ -216,8 +216,8 @@ class ChangeCreator { ...@@ -216,8 +216,8 @@ class ChangeCreator {
final ModuleVisitor vis = new ModuleVisitor(function.getDefiniton()); final ModuleVisitor vis = new ModuleVisitor(function.getDefiniton());
m.accept(vis); m.accept(vis);
if (vis.getIsUsed() if (vis.getIsUsed()
& !m.getImportedModules().contains(function.getFinalDestination().getModule()) && !m.getImportedModules().contains(function.getFinalDestination().getModule())
& !m.equals(function.getFinalDestination().getModule())) { && !m.equals(function.getFinalDestination().getModule())) {
function.addUsedBy(m); function.addUsedBy(m);
} }
} }
......
...@@ -517,7 +517,7 @@ public class MoveFunctionRefactoring extends Refactoring { ...@@ -517,7 +517,7 @@ public class MoveFunctionRefactoring extends Refactoring {
function.addDestination(list.get(0).getKey(), 0, -1); function.addDestination(list.get(0).getKey(), 0, -1);
} }
for (int i=1; i<list.size(); i++) { for (int i=1; i<list.size(); i++) {
if (!(list.get(i).getValue() == 0 & !selectedModules.contains(list.get(i).getKey()))) { if (!(list.get(i).getValue() == 0 && !selectedModules.contains(list.get(i).getKey()))) {
if (max == 0) { if (max == 0) {
function.addDestination(list.get(i).getKey(), 0, -1); function.addDestination(list.get(i).getKey(), 0, -1);
} else if (list.get(i).getValue() == max) { } else if (list.get(i).getValue() == max) {
......
...@@ -206,7 +206,7 @@ public class MoveFunctionWizardDestinationsPage extends UserInputWizardPage { ...@@ -206,7 +206,7 @@ public class MoveFunctionWizardDestinationsPage extends UserInputWizardPage {
if (entry.getValue().contains(dest.getFunctionData())) { if (entry.getValue().contains(dest.getFunctionData())) {
for (final FunctionData fd : entry.getValue()) { for (final FunctionData fd : entry.getValue()) {
if (dest.getFunctionData().equals(fd)) { if (dest.getFunctionData().equals(fd)) {
if (fd.getFinalDestination() != null & !dest.equals(fd.getFinalDestination())) { if (fd.getFinalDestination() != null && !dest.equals(fd.getFinalDestination())) {
tree.setChecked(fd.getFinalDestination(), false); tree.setChecked(fd.getFinalDestination(), false);
} }
if (event.getChecked()) { if (event.getChecked()) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment