Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ public boolean understandsRequest(Request request) {
@Override
//@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "BC_UNCONFIRMED_CAST")
public void showTargetFeedback(Request request) {
if (!understandsRequest(request)) {
return;
}
TabOrderContainerRequest containerRequest = (TabOrderContainerRequest) request;
//
if (containerRequest.getChildren() == null) {
Expand Down Expand Up @@ -114,6 +117,9 @@ private void showChildrenIndexes(List<?> children, Object selectedChild) {
@Override
//@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "BC_UNCONFIRMED_CAST")
public void eraseTargetFeedback(Request request) {
if (!understandsRequest(request)) {
return;
}
eraseChildrenIndexes();
TabOrderContainerRequest containerRequest = (TabOrderContainerRequest) request;
TabOrderCommand command = new TabOrderCommand(getContainer(), containerRequest.getChildren());
Expand Down
46 changes: 0 additions & 46 deletions org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/EditPart.java
Original file line number Diff line number Diff line change
Expand Up @@ -203,20 +203,6 @@ public void installEditPolicy(EditPolicy policy) {
protected void createEditPolicies() {
}

/**
* @return the instances of {@link EditPolicy} which understand given {@link Request}, may be
* empty {@link List}.
*/
private List<EditPolicy> getUnderstandingPolicies(Request request) {
List<EditPolicy> policies = new ArrayList<>();
for (EditPolicy editPolicy : getEditPolicyIterable()) {
if (editPolicy.understandsRequest(request)) {
policies.add(editPolicy);
}
}
return policies;
}

////////////////////////////////////////////////////////////////////////////
//
// Request/Command
Expand All @@ -235,36 +221,4 @@ public void performRequest(Request request) {
}
}
}

////////////////////////////////////////////////////////////////////////////
//
// Target Feedback
//
////////////////////////////////////////////////////////////////////////////
/**
* Shows or updates target feedback for the given request. This method can be called multiple
* times so that the feedback can be updated for changes in the request, such as the mouse
* location changing.
*/
public void showTargetFeedback(Request request) {
if (isActive()) {
for (EditPolicy editPolicy : getUnderstandingPolicies(request)) {
editPolicy.showTargetFeedback(request);
}
}
}

/**
* Erases <i>target</i> feedback for the specified {@link Request}. A {@link Request} is used to
* describe the type of target feedback that should be erased. This method should only be called
* once to erase feedback. It should only be called in conjunction with a prior call to
* {@link #showTargetFeedback(Request)}.
*/
public void eraseTargetFeedback(Request request) {
if (isActive()) {
for (EditPolicy editPolicy : getUnderstandingPolicies(request)) {
editPolicy.eraseTargetFeedback(request);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -219,14 +219,16 @@ protected Command getOrphanCommand(GroupRequest request) {
////////////////////////////////////////////////////////////////////////////
@Override
public void showTargetFeedback(Request request) {
if (isRequestCondition(request)) {
if (understandsRequest(request)) {
showLayoutTargetFeedback(request);
}
}

@Override
public void eraseTargetFeedback(Request request) {
eraseLayoutTargetFeedback(request);
if (understandsRequest(request)) {
eraseLayoutTargetFeedback(request);
}
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -280,14 +280,14 @@ protected Command getAddCommand(List<? extends EditPart> addParts, Object refere
////////////////////////////////////////////////////////////////////////////
@Override
public void showTargetFeedback(Request request) {
if (isRequestCondition(request)) {
if (understandsRequest(request)) {
showLayoutTargetFeedback(request);
}
}

@Override
public void eraseTargetFeedback(Request request) {
if (isRequestCondition(request)) {
if (understandsRequest(request)) {
eraseLayoutTargetFeedback(request);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,16 @@ protected Layer getFeedbackLayer() {

@Override
public void showTargetFeedback(Request request) {
PolicyUtils.showBorderTargetFeedback(this);
if (understandsRequest(request)) {
PolicyUtils.showBorderTargetFeedback(this);
}
}

@Override
public void eraseTargetFeedback(Request request) {
PolicyUtils.eraseBorderTargetFeedback(this);
if (understandsRequest(request)) {
PolicyUtils.eraseBorderTargetFeedback(this);
}
}

////////////////////////////////////////////////////////////////////////////
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -353,12 +353,8 @@ public void eraseTargetFeedback(Request request) {
//
"eraseSourceFeedback",
//
"understandsRequest",
//
"showTargetFeedback",
//
"understandsRequest",
//
"eraseTargetFeedback"}, request);
actualLogger.assertEquals(expectedLogger);
actualLogger.clear();
Expand Down
Loading