aboutsummaryrefslogtreecommitdiffstats
path: root/rule_api/src
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2011-12-20 20:20:24 -0800
committerTor Norbye <tnorbye@google.com>2011-12-21 13:36:23 -0800
commitab36f4e7488358dea4ab6b54ee2b7bef3da0232b (patch)
treee6846336e35cd0fb29addf962c9031c68492ed30 /rule_api/src
parent4ae7075d188a35298d834bfcd0500b77b08a12ab (diff)
downloadsdk-ab36f4e7488358dea4ab6b54ee2b7bef3da0232b.zip
sdk-ab36f4e7488358dea4ab6b54ee2b7bef3da0232b.tar.gz
sdk-ab36f4e7488358dea4ab6b54ee2b7bef3da0232b.tar.bz2
Update SDK codebase to JDK 6
This changeset makes the SDK codebase compile with source=1.6 (which means it also requires JDK 6). This means that methods implementing an interface requires @Override's. It also means we can start using APIs like the ArrayDeque class and methods like String#isEmpty(). This changeset looks big but the change is trivial: it's basically adding @Override in all the places that need it, along with some other automatic Eclipse cleanup in certain files (such as reordering imports where they were incorrectly ordered (because older versions of Eclipse didn't always handle inner classes right)), as well as cleaning up trailing whitespace and removing some $NON-NLS-1$ markers on lines where there aren't any string literals anymore. This changeset also sets the source and target JDK level to 6 in the Eclipse compiler .settings file, and synchronizes this file to all the other Eclipse SDK projects. Change-Id: I6a9585aa44c3dee9a5c00739ab22fbdbcb9f8275
Diffstat (limited to 'rule_api/src')
-rw-r--r--rule_api/src/com/android/ide/common/api/AbstractViewRule.java18
-rwxr-xr-xrule_api/src/com/android/ide/common/api/RuleAction.java1
2 files changed, 19 insertions, 0 deletions
diff --git a/rule_api/src/com/android/ide/common/api/AbstractViewRule.java b/rule_api/src/com/android/ide/common/api/AbstractViewRule.java
index e915e2c..86e7896 100644
--- a/rule_api/src/com/android/ide/common/api/AbstractViewRule.java
+++ b/rule_api/src/com/android/ide/common/api/AbstractViewRule.java
@@ -29,13 +29,16 @@ import java.util.List;
*/
@Beta
public class AbstractViewRule implements IViewRule {
+ @Override
public boolean onInitialize(String fqcn, IClientRulesEngine engine) {
return true;
}
+ @Override
public void onDispose() {
}
+ @Override
public String getDisplayName() {
// Default is to not override the selection display name.
return null;
@@ -43,17 +46,21 @@ public class AbstractViewRule implements IViewRule {
// ==== Selection ====
+ @Override
public List<String> getSelectionHint(INode parentNode, INode childNode) {
return null;
}
+ @Override
public void addLayoutActions(List<RuleAction> actions, INode parentNode,
List<? extends INode> children) {
}
+ @Override
public void addContextMenuActions(List<RuleAction> actions, INode node) {
}
+ @Override
public void paintSelectionFeedback(IGraphics graphics, INode parentNode,
List<? extends INode> childNodes, Object view) {
}
@@ -61,19 +68,23 @@ public class AbstractViewRule implements IViewRule {
// ==== Drag & drop support ====
// By default Views do not accept drag'n'drop.
+ @Override
public DropFeedback onDropEnter(INode targetNode, Object targetView, IDragElement[] elements) {
return null;
}
+ @Override
public DropFeedback onDropMove(INode targetNode, IDragElement[] elements,
DropFeedback feedback, Point p) {
return null;
}
+ @Override
public void onDropLeave(INode targetNode, IDragElement[] elements, DropFeedback feedback) {
// ignore
}
+ @Override
public void onDropped(
INode targetNode,
IDragElement[] elements,
@@ -83,31 +94,38 @@ public class AbstractViewRule implements IViewRule {
}
+ @Override
public void onPaste(INode targetNode, Object targetView, IDragElement[] pastedElements) {
}
// ==== Create/Remove hooks ====
+ @Override
public void onCreate(INode node, INode parent, InsertType insertType) {
}
+ @Override
public void onChildInserted(INode child, INode parent, InsertType insertType) {
}
+ @Override
public void onRemovingChildren(List<INode> deleted, INode parent) {
}
// ==== Resizing ====
+ @Override
public DropFeedback onResizeBegin(INode child, INode parent, SegmentType horizontalEdge,
SegmentType verticalEdge, Object childView, Object parentView) {
return null;
}
+ @Override
public void onResizeUpdate(DropFeedback feedback, INode child, INode parent, Rect newBounds,
int modifierMask) {
}
+ @Override
public void onResizeEnd(DropFeedback feedback, INode child, final INode parent,
final Rect newBounds) {
}
diff --git a/rule_api/src/com/android/ide/common/api/RuleAction.java b/rule_api/src/com/android/ide/common/api/RuleAction.java
index 71a6ac9..5b6dc7f 100755
--- a/rule_api/src/com/android/ide/common/api/RuleAction.java
+++ b/rule_api/src/com/android/ide/common/api/RuleAction.java
@@ -397,6 +397,7 @@ public class RuleAction implements Comparable<RuleAction> {
}
// Implements Comparable<MenuAciton>
+ @Override
public int compareTo(RuleAction other) {
if (mSortPriority != other.mSortPriority) {
return mSortPriority - other.mSortPriority;