Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup and re-format Zest JFace snippets #644

Merged
merged 1 commit into from
Dec 28, 2024
Merged

Cleanup and re-format Zest JFace snippets #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions org.eclipse.zest.examples/src/org/eclipse/zest/examples/jface/GraphJFaceSnippet1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ public Object[] getElements(Object inputElement) {
return new String[] { Messages.First, Messages.Second, Messages.Third };
}

public double getWeight(Object entity1, Object entity2) {
return 0;
}

@Override
public void dispose() {

Expand Down
10 changes: 4 additions & 6 deletions org.eclipse.zest.examples/src/org/eclipse/zest/examples/jface/GraphJFaceSnippet2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ static class MyContentProvider implements IGraphContentProvider {
public Object getDestination(Object rel) {
if (Messages.Rock2Paper.equals(rel)) {
return Messages.Rock;
} else if (Messages.Paper2Scissors.equals(rel)) {
}
if (Messages.Paper2Scissors.equals(rel)) {
return Messages.Paper;
} else if (Messages.Scissors2Rock.equals(rel)) {
return Messages.Scissors;
Expand All @@ -63,18 +64,15 @@ public Object[] getElements(Object input) {
public Object getSource(Object rel) {
if (Messages.Rock2Paper.equals(rel)) {
return Messages.Paper;
} else if (Messages.Paper2Scissors.equals(rel)) {
}
if (Messages.Paper2Scissors.equals(rel)) {
return Messages.Scissors;
} else if (Messages.Scissors2Rock.equals(rel)) {
return Messages.Rock;
}
return null;
}

public double getWeight(Object connection) {
return 0;
}

@Override
public void dispose() {
}
Expand Down
4 changes: 0 additions & 4 deletions org.eclipse.zest.examples/src/org/eclipse/zest/examples/jface/GraphJFaceSnippet3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@ public Object getSource(Object rel) {
return parts[0];
}

public double getWeight(Object connection) {
return 0;
}

@Override
public void dispose() {

Expand Down
25 changes: 12 additions & 13 deletions org.eclipse.zest.examples/src/org/eclipse/zest/examples/jface/GraphJFaceSnippet4.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
import org.eclipse.swt.widgets.Shell;

import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.zest.core.viewers.GraphViewer;
import org.eclipse.zest.core.viewers.IGraphContentProvider;
Expand All @@ -37,9 +37,11 @@ static class MyContentProvider implements IGraphContentProvider {
public Object getDestination(Object rel) {
if (Messages.Rock2Paper.equals(rel)) {
return Messages.Rock;
} else if (Messages.Paper2Scissors.equals(rel)) {
}
if (Messages.Paper2Scissors.equals(rel)) {
return Messages.Paper;
} else if (Messages.Scissors2Rock.equals(rel)) {
}
if (Messages.Scissors2Rock.equals(rel)) {
return Messages.Scissors;
}
return null;
Expand All @@ -54,18 +56,16 @@ public Object[] getElements(Object input) {
public Object getSource(Object rel) {
if (Messages.Rock2Paper.equals(rel)) {
return Messages.Paper;
} else if (Messages.Paper2Scissors.equals(rel)) {
}
if (Messages.Paper2Scissors.equals(rel)) {
return Messages.Scissors;
} else if (Messages.Scissors2Rock.equals(rel)) {
}
if (Messages.Scissors2Rock.equals(rel)) {
return Messages.Rock;
}
return null;
}

public double getWeight(Object connection) {
return 0;
}

@Override
public void dispose() {
}
Expand Down Expand Up @@ -114,13 +114,12 @@ public static void main(String[] args) {

@Override
public void selectionChanged(SelectionChangedEvent event) {
System.out
.println("Selection Changed: " + selectionToString((StructuredSelection) event.getSelection())); //$NON-NLS-1$
System.out.println("Selection Changed: " + selectionToString(event.getStructuredSelection())); //$NON-NLS-1$
}

private String selectionToString(StructuredSelection selection) {
private String selectionToString(IStructuredSelection selection) {
StringBuffer stringBuffer = new StringBuffer();
Iterator iterator = selection.iterator();
Iterator<?> iterator = selection.iterator();
boolean first = true;
while (iterator.hasNext()) {
if (first) {
Expand Down
4 changes: 0 additions & 4 deletions org.eclipse.zest.examples/src/org/eclipse/zest/examples/jface/GraphJFaceSnippet5.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@ public void setElements(Object[] elements) {
this.elements = elements;
}

public double getWeight(Object connection) {
return 0;
}

@Override
public void dispose() {
}
Expand Down
4 changes: 0 additions & 4 deletions org.eclipse.zest.examples/src/org/eclipse/zest/examples/jface/GraphJFaceSnippet6.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ public Object[] getElements(Object inputElement) {
return new String[] { Messages.First, Messages.Second, Messages.Third };
}

public double getWeight(Object entity1, Object entity2) {
return 0;
}

@Override
public void dispose() {

Expand Down
4 changes: 0 additions & 4 deletions org.eclipse.zest.examples/src/org/eclipse/zest/examples/jface/GraphJFaceSnippet7.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,6 @@ public Object[] getElements(Object inputElement) {
return new String[] { Messages.First, Messages.Second, Messages.Third };
}

public double getWeight(Object entity1, Object entity2) {
return 0;
}

@Override
public void dispose() {

Expand Down
6 changes: 1 addition & 5 deletions org.eclipse.zest.examples/src/org/eclipse/zest/examples/jface/GraphJFaceSnippet8.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@ public Object[] getElements(Object inputElement) {
return new String[] { Messages.First, Messages.Second, Messages.Third };
}

public double getWeight(Object entity1, Object entity2) {
return 0;
}

@Override
public void dispose() {

Expand Down Expand Up @@ -101,7 +97,7 @@ public void selfStyleConnection(Object element, GraphConnection connection) {
pc.setSourceDecoration(createDecoration(ColorConstants.green));
}

private PolygonDecoration createDecoration(final Color color) {
private static PolygonDecoration createDecoration(final Color color) {
PolygonDecoration decoration = new PolygonDecoration() {
@Override
protected void fillShape(Graphics g) {
Expand Down
12 changes: 5 additions & 7 deletions ...clipse.zest.examples/src/org/eclipse/zest/examples/jface/ManhattanLayoutJFaceSnippet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.zest.core.viewers.GraphViewer;
import org.eclipse.zest.core.viewers.IConnectionStyleProvider;
import org.eclipse.zest.core.viewers.IConnectionStyleProvider2;
import org.eclipse.zest.core.viewers.IEntityConnectionStyleProvider2;
import org.eclipse.zest.core.viewers.IGraphContentProvider;
Expand All @@ -40,8 +41,8 @@
import org.eclipse.draw2d.ManhattanConnectionRouter;

/**
* This snippet shows how to use the {@link IConnectionRouterStyleProvider}
* interface to set the connection router for some references.
* This snippet shows how to use the {@link IConnectionStyleProvider} interface
* to set the connection router for some references.
*
* Based on {@link GraphJFaceSnippet4}.
*
Expand Down Expand Up @@ -86,10 +87,6 @@ public Object getSource(Object rel) {
return null;
}

public double getWeight(Object connection) {
return 0;
}

@Override
public void dispose() {
}
Expand Down Expand Up @@ -118,6 +115,7 @@ public String getText(Object element) {

/* Relation-based customization: IConnectionStyleProvider */

@Override
public ConnectionRouter getRouter(Object rel) {
if (!rel.equals(Messages.Scissors2Rock)) {
return new ManhattanConnectionRouter();
Expand Down Expand Up @@ -237,7 +235,7 @@ public void selectionChanged(SelectionChangedEvent event) {

private String selectionToString(StructuredSelection selection) {
StringBuffer stringBuffer = new StringBuffer();
Iterator iterator = selection.iterator();
Iterator<?> iterator = selection.iterator();
boolean first = true;
while (iterator.hasNext()) {
if (first) {
Expand Down
Loading