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 @@ -94,13 +94,17 @@ public Command getCommand(Request request) {
@Override
//@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "BC_UNCONFIRMED_CAST")
public void showSourceFeedback(Request request) {
showResizeFeedback((ChangeBoundsRequest) request);
if (REQ_RESIZE.equals(request.getType())) {
showResizeFeedback((ChangeBoundsRequest) request);
}
}

@Override
//@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "BC_UNCONFIRMED_CAST")
public void eraseSourceFeedback(Request request) {
eraseResizeFeedback((ChangeBoundsRequest) request);
if (REQ_RESIZE.equals(request.getType())) {
eraseResizeFeedback((ChangeBoundsRequest) request);
}
}

////////////////////////////////////////////////////////////////////////////
Expand Down
32 changes: 0 additions & 32 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 @@ -236,38 +236,6 @@ public void performRequest(Request request) {
}
}

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

/**
* Erases <i>source</i> feedback for the specified {@link Request}. A {@link Request} is used to
* describe the type of source 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 #showSourceFeedback(Request)}.
*/
public void eraseSourceFeedback(Request request) {
if (isActive()) {
for (EditPolicy editPolicy : getUnderstandingPolicies(request)) {
editPolicy.eraseSourceFeedback(request);
}
}
}

////////////////////////////////////////////////////////////////////////////
//
// Target Feedback
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,17 @@ public Command getCommand(Request request) {
@Override
//@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "BC_UNCONFIRMED_CAST")
public void showSourceFeedback(Request request) {
showResizeFeedback((ChangeBoundsRequest) request);
if (REQ_RESIZE.equals(request.getType())) {
showResizeFeedback((ChangeBoundsRequest) request);
}
}

@Override
//@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "BC_UNCONFIRMED_CAST")
public void eraseSourceFeedback(Request request) {
eraseResizeFeedback((ChangeBoundsRequest) request);
if (REQ_RESIZE.equals(request.getType())) {
eraseResizeFeedback((ChangeBoundsRequest) request);
}
}

////////////////////////////////////////////////////////////////////////////
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public void refreshed() throws Exception {
/**
* @return the cells {@link Rectangle} occupied by host component.
*/
private Rectangle getComponentCells() throws Exception {
private Rectangle getComponentCells() {
return getGridInfo().getComponentCells(m_component);
}

Expand Down Expand Up @@ -304,25 +304,21 @@ public boolean understandsRequest(Request request) {

@Override
public void showSourceFeedback(Request request) {
try {
if (request instanceof ChangeBoundsRequest cbRequest) {
if (REQ_RESIZE_SIZE.equals(request.getType())) {
showSizeFeedback(cbRequest);
}
if (REQ_RESIZE_SPAN.equals(request.getType())) {
showSpanFeedback(cbRequest);
}
}
} catch (Throwable e) {
DesignerPlugin.log(e);
if (REQ_RESIZE_SIZE.equals(request.getType())) {
showSizeFeedback((ChangeBoundsRequest) request);
}
if (REQ_RESIZE_SPAN.equals(request.getType())) {
showSpanFeedback((ChangeBoundsRequest) request);
}
}

@Override
public void eraseSourceFeedback(Request request) {
if (m_lineFeedback != null) {
removeFeedback(m_lineFeedback);
m_lineFeedback = null;
if (REQ_RESIZE_SIZE.equals(request.getType()) || REQ_RESIZE_SPAN.equals(request.getType())) {
if (m_lineFeedback != null) {
removeFeedback(m_lineFeedback);
m_lineFeedback = null;
}
}
}

Expand Down Expand Up @@ -368,7 +364,7 @@ protected final Handle createSizeHandle(int direction, Locator locator) {
/**
* Shows feedback and creates command for resize.
*/
private void showSizeFeedback(ChangeBoundsRequest request) throws Exception {
private void showSizeFeedback(ChangeBoundsRequest request) {
// prepare new bounds
Rectangle bounds = m_component.getModelBounds().getCopy();
bounds.performTranslate(request.getMoveDelta());
Expand Down Expand Up @@ -449,7 +445,7 @@ protected final Handle createSpanHandle(int direction, Locator locator) {
/**
* Shows feedback and creates command for span.
*/
private void showSpanFeedback(ChangeBoundsRequest request) throws Exception {
private void showSpanFeedback(ChangeBoundsRequest request) {
IGridInfo gridInfo = getGridInfo();
// prepare cells
Rectangle cells = getComponentCells().getCopy();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,14 +188,18 @@ public boolean understandsRequest(Request request) {

@Override
public void showSourceFeedback(Request request) {
showResizeFeedback((ChangeBoundsRequest) request);
if (REQ_RESIZE.equals(request.getType())) {
showResizeFeedback((ChangeBoundsRequest) request);
}
}

@Override
public void eraseSourceFeedback(Request request) {
removeFeedbacks();
m_resizeInProgress = false;
m_movingBounds = null;
if (REQ_RESIZE.equals(request.getType())) {
removeFeedbacks();
m_resizeInProgress = false;
m_movingBounds = null;
}
}

private void showResizeFeedback(ChangeBoundsRequest request) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,16 @@ public Command getCommand(final Request request) {

@Override
public void showSourceFeedback(Request request) {
showResizeFeedback((ChangeBoundsRequest) request);
if (REQ_RESIZE.equals(request.getType())) {
showResizeFeedback((ChangeBoundsRequest) request);
}
}

@Override
public void eraseSourceFeedback(Request request) {
eraseResizeFeedback((ChangeBoundsRequest) request);
if (REQ_RESIZE.equals(request.getType())) {
eraseResizeFeedback((ChangeBoundsRequest) request);
}
}

////////////////////////////////////////////////////////////////////////////
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,16 @@ public Command getCommand(final Request request) {

@Override
public void showSourceFeedback(Request request) {
showResizeFeedback((ChangeBoundsRequest) request);
if (REQ_RESIZE.equals(request.getType())) {
showResizeFeedback((ChangeBoundsRequest) request);
}
}

@Override
public void eraseSourceFeedback(Request request) {
eraseResizeFeedback((ChangeBoundsRequest) request);
if (REQ_RESIZE.equals(request.getType())) {
eraseResizeFeedback((ChangeBoundsRequest) request);
}
}

////////////////////////////////////////////////////////////////////////////
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,16 @@ public Command getCommand(final Request request) {

@Override
public void showSourceFeedback(Request request) {
showResizeFeedback((ChangeBoundsRequest) request);
if (REQ_RESIZE.equals(request.getType())) {
showResizeFeedback((ChangeBoundsRequest) request);
}
}

@Override
public void eraseSourceFeedback(Request request) {
eraseResizeFeedback((ChangeBoundsRequest) request);
if (REQ_RESIZE.equals(request.getType())) {
eraseResizeFeedback((ChangeBoundsRequest) request);
}
}

////////////////////////////////////////////////////////////////////////////
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,16 @@ public Command getCommand(final Request request) {

@Override
public void showSourceFeedback(Request request) {
showResizeFeedback((ChangeBoundsRequest) request);
if (REQ_RESIZE.equals(request.getType())) {
showResizeFeedback((ChangeBoundsRequest) request);
}
}

@Override
public void eraseSourceFeedback(Request request) {
eraseResizeFeedback((ChangeBoundsRequest) request);
if (REQ_RESIZE.equals(request.getType())) {
eraseResizeFeedback((ChangeBoundsRequest) request);
}
}

////////////////////////////////////////////////////////////////////////////
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ public void execute() {

@Override
public void showSourceFeedback(Request request) {
if (!understandsRequest(request)) {
return;
}
ChangeBoundsRequest changeBoundsRequest = (ChangeBoundsRequest) request;
m_resizeCommand = null;
// line feedback
Expand Down Expand Up @@ -223,6 +226,9 @@ private void updateFeedbackText(Request request, boolean snapToEnabled) {

@Override
public void eraseSourceFeedback(Request request) {
if (!understandsRequest(request)) {
return;
}
removeFeedback(m_lineFeedback);
m_lineFeedback = null;
//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,9 @@ public void execute() {

@Override
public void showSourceFeedback(Request request) {
if (!understandsRequest(request)) {
return;
}
ChangeBoundsRequest changeBoundsRequest = (ChangeBoundsRequest) request;
m_resizeCommand = null;
// line feedback
Expand Down Expand Up @@ -298,6 +301,9 @@ protected void executeEdit() throws Exception {

@Override
public void eraseSourceFeedback(Request request) {
if (!understandsRequest(request)) {
return;
}
removeFeedback(m_lineFeedback);
m_lineFeedback = null;
//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,16 @@ public Command getCommand(Request request) {

@Override
public void showSourceFeedback(Request request) {
showResizeFeedback((ChangeBoundsRequest) request);
if (REQ_RESIZE.equals(request.getType())) {
showResizeFeedback((ChangeBoundsRequest) request);
}
}

@Override
public void eraseSourceFeedback(Request request) {
eraseResizeFeedback((ChangeBoundsRequest) request);
if (REQ_RESIZE.equals(request.getType())) {
eraseResizeFeedback((ChangeBoundsRequest) request);
}
}

////////////////////////////////////////////////////////////////////////////
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@ public Command getCommand(Request request) {

@Override
public void showSourceFeedback(Request request) {
if (!understandsRequest(request)) {
return;
}
ChangeBoundsRequest changeBoundsRequest = (ChangeBoundsRequest) request;
m_resizeCommand = null;
// line feedback
Expand Down Expand Up @@ -185,6 +188,9 @@ public void showSourceFeedback(Request request) {

@Override
public void eraseSourceFeedback(Request request) {
if (!understandsRequest(request)) {
return;
}
removeFeedback(m_lineFeedback);
m_lineFeedback = null;
m_feedback.remove();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,17 @@ public Command getCommand(Request request) {
@Override
//@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "BC_UNCONFIRMED_CAST")
public void showSourceFeedback(Request request) {
showResizeFeedback((ChangeBoundsRequest) request);
if (REQ_RESIZE == request.getType()) {
showResizeFeedback((ChangeBoundsRequest) request);
}
}

@Override
//@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "BC_UNCONFIRMED_CAST")
public void eraseSourceFeedback(Request request) {
eraseResizeFeedback((ChangeBoundsRequest) request);
if (REQ_RESIZE == request.getType()) {
eraseResizeFeedback((ChangeBoundsRequest) request);
}
}

////////////////////////////////////////////////////////////////////////////
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,14 @@ public Command getCommand(Request request) {

@Override
public void showSourceFeedback(Request request) {
if (request instanceof ChangeBoundsRequest) {
if (REQ_RESIZE == request.getType()) {
showResizeFeedback((ChangeBoundsRequest) request);
}
}

@Override
public void eraseSourceFeedback(Request request) {
if (request instanceof ChangeBoundsRequest) {
if (REQ_RESIZE == request.getType()) {
eraseResizeFeedback((ChangeBoundsRequest) request);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,14 @@ public void run() throws Exception {

@Override
public void eraseSourceFeedback(Request request) {
super.eraseSourceFeedback(request);
if (sourceFeedbackFigure != null) {
removeFeedback(sourceFeedbackFigure);
sourceFeedbackFigure = null;
if (AbsoluteBasedSelectionEditPolicy.REQ_RESIZE.equals(request.getType())) {
if (sourceFeedbackFigure != null) {
removeFeedback(sourceFeedbackFigure);
sourceFeedbackFigure = null;
}
removeResizeFeedbacks();
hideSizeHints();
}
removeResizeFeedbacks();
hideSizeHints();
}

private void showResizeFeedback(ChangeBoundsRequest request) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -349,16 +349,16 @@ public void eraseTargetFeedback(Request request) {
//
"getTargetEditPart",
//
"understandsRequest",
"showSourceFeedback",
//
"understandsRequest",
"eraseSourceFeedback",
//
"understandsRequest",
//
"showTargetFeedback",
//
"understandsRequest",
//
"eraseTargetFeedback"}, request);
actualLogger.assertEquals(expectedLogger);
actualLogger.clear();
Expand Down
Loading