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

Jump to bottom

migrate to Java 17 switch semantics #570

Merged
merged 1 commit into from
Apr 11, 2023
Merged

migrate to Java 17 switch semantics #570

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
50 changes: 18 additions & 32 deletions ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDELabelProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,19 +500,12 @@ public Image getImage(Object obj) {

private Image getObjectImage(ResolverError obj) {
int type = obj.getType();
switch (type) {
case ResolverError.MISSING_IMPORT_PACKAGE :
case ResolverError.EXPORT_PACKAGE_PERMISSION :
case ResolverError.IMPORT_PACKAGE_PERMISSION :
case ResolverError.IMPORT_PACKAGE_USES_CONFLICT :
return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKAGE);
case ResolverError.MISSING_EXECUTION_ENVIRONMENT :
return get(PDEPluginImages.DESC_JAVA_LIB_OBJ);
case ResolverError.FRAGMENT_BUNDLE_PERMISSION :
case ResolverError.FRAGMENT_CONFLICT :
return get(PDEPluginImages.DESC_FRAGMENT_OBJ);
}
return get(PDEPluginImages.DESC_PLUGIN_OBJ);
return switch (type) {
case ResolverError.MISSING_IMPORT_PACKAGE, ResolverError.EXPORT_PACKAGE_PERMISSION, ResolverError.IMPORT_PACKAGE_PERMISSION, ResolverError.IMPORT_PACKAGE_USES_CONFLICT -> JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKAGE);
case ResolverError.MISSING_EXECUTION_ENVIRONMENT -> get(PDEPluginImages.DESC_JAVA_LIB_OBJ);
case ResolverError.FRAGMENT_BUNDLE_PERMISSION, ResolverError.FRAGMENT_CONFLICT -> get(PDEPluginImages.DESC_FRAGMENT_OBJ);
default -> get(PDEPluginImages.DESC_PLUGIN_OBJ);
};
}

private Image getObjectImage(ExecutionEnvironment environment) {
Expand Down Expand Up @@ -696,17 +689,13 @@ private Image getObjectImage(ISchemaAttribute att) {
}

private Image getObjectImage(ISchemaCompositor compositor) {
switch (compositor.getKind()) {
case ISchemaCompositor.ALL :
return get(PDEPluginImages.DESC_ALL_SC_OBJ);
case ISchemaCompositor.CHOICE :
return get(PDEPluginImages.DESC_CHOICE_SC_OBJ);
case ISchemaCompositor.SEQUENCE :
return get(PDEPluginImages.DESC_SEQ_SC_OBJ);
case ISchemaCompositor.GROUP :
return get(PDEPluginImages.DESC_GROUP_SC_OBJ);
}
return null;
return switch (compositor.getKind()) {
case ISchemaCompositor.ALL -> get(PDEPluginImages.DESC_ALL_SC_OBJ);
case ISchemaCompositor.CHOICE -> get(PDEPluginImages.DESC_CHOICE_SC_OBJ);
case ISchemaCompositor.SEQUENCE -> get(PDEPluginImages.DESC_SEQ_SC_OBJ);
case ISchemaCompositor.GROUP -> get(PDEPluginImages.DESC_GROUP_SC_OBJ);
default -> null;
};
}

private Image getObjectImage(IFeatureURLElement url) {
Expand Down Expand Up @@ -843,14 +832,11 @@ public Image getObjectImage(PackageObject obj) {

private Image getObjectImage(IStatus status) {
int sev = status.getSeverity();
switch (sev) {
case IStatus.ERROR :
return PlatformUI.getWorkbench().getSharedImages().getImage(org.eclipse.ui.ISharedImages.IMG_OBJS_ERROR_TSK);
case IStatus.WARNING :
return PlatformUI.getWorkbench().getSharedImages().getImage(org.eclipse.ui.ISharedImages.IMG_OBJS_WARN_TSK);
default :
return PlatformUI.getWorkbench().getSharedImages().getImage(org.eclipse.ui.ISharedImages.IMG_OBJS_INFO_TSK);
}
return switch (sev) {
case IStatus.ERROR -> PlatformUI.getWorkbench().getSharedImages().getImage(org.eclipse.ui.ISharedImages.IMG_OBJS_ERROR_TSK);
case IStatus.WARNING -> PlatformUI.getWorkbench().getSharedImages().getImage(org.eclipse.ui.ISharedImages.IMG_OBJS_WARN_TSK);
default -> PlatformUI.getWorkbench().getSharedImages().getImage(org.eclipse.ui.ISharedImages.IMG_OBJS_INFO_TSK);
};
}

public boolean isFullNameModeEnabled() {
Expand Down
12 changes: 5 additions & 7 deletions ...g.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandTreeContentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,11 @@ public boolean hasChildren(Object element) {

@Override
public Object[] getElements(Object inputElement) {
switch (fCurContent) {
case F_CAT_CONTENT :
return fCatMap.keySet().toArray();
case F_CON_CONTENT :
return new Object[0];
}
return null;
return switch (fCurContent) {
case F_CAT_CONTENT -> fCatMap.keySet().toArray();
case F_CON_CONTENT -> new Object[0];
default -> null;
};
}

@Override
Expand Down
21 changes: 7 additions & 14 deletions ...clipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AbstractPDEMarkerResolution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,20 +68,13 @@ public IMarker[] findOtherMarkers(IMarker[] markers) {
public Image getImage() {
if (image == null) {
PDELabelProvider labelProvider = PDEPlugin.getDefault().getLabelProvider();
switch (this.getType()) {
case AbstractPDEMarkerResolution.CREATE_TYPE:
image = labelProvider.get(PDEPluginImages.DESC_ADD_ATT);
break;
case AbstractPDEMarkerResolution.REMOVE_TYPE:
image = labelProvider.get(PDEPluginImages.DESC_DELETE);
break;
case AbstractPDEMarkerResolution.RENAME_TYPE:
image = labelProvider.get(PDEPluginImages.DESC_REFRESH);
break;
case AbstractPDEMarkerResolution.CONFIGURE_TYPE:
image = labelProvider.get(PDEPluginImages.DESC_CON_SEV);
break;
}
image = switch (this.getType()) {
case AbstractPDEMarkerResolution.CREATE_TYPE -> labelProvider.get(PDEPluginImages.DESC_ADD_ATT);
case AbstractPDEMarkerResolution.REMOVE_TYPE -> labelProvider.get(PDEPluginImages.DESC_DELETE);
case AbstractPDEMarkerResolution.RENAME_TYPE -> labelProvider.get(PDEPluginImages.DESC_REFRESH);
case AbstractPDEMarkerResolution.CONFIGURE_TYPE -> labelProvider.get(PDEPluginImages.DESC_CON_SEV);
default -> image;
};
}
return image;
}
Expand Down
12 changes: 5 additions & 7 deletions ...eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/JavaResolutionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,13 +533,11 @@ public static final Object createExportPackageProposal(IProject project, IPackag
}

private static final Object createWrapper(AbstractManifestChange change, int type, int relevance) {
switch (type) {
case TYPE_JAVA_COMPLETION :
return createJavaCompletionProposal(change, relevance);
case TYPE_CLASSPATH_FIX :
return createClasspathFixProposal(change, relevance);
}
return null;
return switch (type) {
case TYPE_JAVA_COMPLETION -> createJavaCompletionProposal(change, relevance);
case TYPE_CLASSPATH_FIX -> createClasspathFixProposal(change, relevance);
default -> null;
};
}

// Methods to wrap a AbstractMethodChange into a consumable format
Expand Down
19 changes: 6 additions & 13 deletions ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ModelUndoManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,19 +178,12 @@ private String getRedoText() {
}

private String getOperationText(IModelChangedEvent op) {
String opText = ""; //$NON-NLS-1$
switch (op.getChangeType()) {
case IModelChangedEvent.INSERT :
opText = PDEUIMessages.UpdateManager_op_add;
break;
case IModelChangedEvent.REMOVE :
opText = PDEUIMessages.UpdateManager_op_remove;
break;
case IModelChangedEvent.CHANGE :
opText = PDEUIMessages.UpdateManager_op_change;
break;
}
return opText;
return switch (op.getChangeType()) {
case IModelChangedEvent.INSERT -> PDEUIMessages.UpdateManager_op_add;
case IModelChangedEvent.REMOVE -> PDEUIMessages.UpdateManager_op_remove;
case IModelChangedEvent.CHANGE -> PDEUIMessages.UpdateManager_op_change;
default -> ""; //$NON-NLS-1$
};
}

@Override
Expand Down
10 changes: 2 additions & 8 deletions ...rg.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildClasspathSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,14 +341,8 @@ private String getRelativePathTokenName(IResource elem) {
@Override
protected void buttonSelected(int index) {
switch (index) {
case 0 :
handleNew();
break;
case 1 :
handleDelete();
break;
default :
break;
case 0 -> handleNew();
case 1 -> handleDelete();
}
}

Expand Down
15 changes: 4 additions & 11 deletions ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildInputContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,10 @@ protected void addTextEditOperation(ArrayList<TextEdit> ops, IModelChangedEvent
ops.remove(op);
}
switch (event.getChangeType()) {
case IModelChangedEvent.REMOVE :
deleteKey(key, ops);
break;
case IModelChangedEvent.INSERT :
insertKey(key, ops);
break;
case IModelChangedEvent.CHANGE :
modifyKey(key, ops);
default :
break;
}
case IModelChangedEvent.REMOVE -> deleteKey(key, ops);
case IModelChangedEvent.INSERT -> insertKey(key, ops);
case IModelChangedEvent.CHANGE -> modifyKey(key, ops);
};
}
}

Expand Down
14 changes: 4 additions & 10 deletions ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/RuntimeInfoSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,10 @@ else if (element instanceof String)
public void buttonSelected(Button button, int index) {
if (getViewer() == fLibraryPart.getViewer()) {
switch (index) {
case F_NEW_INDEX :
handleNew();
break;
case F_UP_UNDEX : // move up
updateJarsCompileOrder(true);
break;
case F_DOWN_INDEX : // move down
updateJarsCompileOrder(false);
break;
}
case F_NEW_INDEX -> handleNew();
case F_UP_UNDEX -> updateJarsCompileOrder(true);
case F_DOWN_INDEX -> updateJarsCompileOrder(false);
};
} else if (getViewer() == fFolderPart.getViewer() && index == F_NEW_INDEX)
handleNewFolder();
else
Expand Down
19 changes: 5 additions & 14 deletions ....eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/DownloadStatsSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,20 +154,11 @@ public int category(Object element) {
@Override
protected void buttonSelected(int index) {
switch (index) {
case 0 :
handleNewFeature();
break;
case 1 :
handleNewBundle();
break;
case 2 :
handleRemove();
break;
case 3 :
handleRemoveAll();
break;

}
case 0 -> handleNewFeature();
case 1 -> handleNewBundle();
case 2 -> handleRemove();
case 3 -> handleRemoveAll();
};
}

private void handleRemove() {
Expand Down
30 changes: 10 additions & 20 deletions ...se.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/RepositoryReferenceSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,11 @@ public Image getColumnImage(Object obj, int index) {
@Override
public String getColumnText(Object obj, int index) {
IRepositoryReference repo = (IRepositoryReference) obj;
switch (index) {
case 0 :
return repo.getURL();
case 1 :
return Boolean.toString(repo.getEnabled());
}
return null;
return switch (index) {
case 0 -> repo.getURL();
case 1 -> Boolean.toString(repo.getEnabled());
default -> null;
};
}

}
Expand Down Expand Up @@ -168,19 +166,11 @@ public int compare(Viewer viewer, Object e1, Object e2) {
@Override
protected void buttonSelected(int index) {
switch (index) {
case 0 :
handleAdd();
break;
case 1 :
handleEdit(fRepositoryTable.getStructuredSelection());
break;
case 2 :
handleDelete();
break;
case 3 :
handleRemoveAll();
break;
}
case 0 -> handleAdd();
case 1 -> handleEdit(fRepositoryTable.getStructuredSelection());
case 2 -> handleDelete();
case 3 -> handleRemoveAll();
};
}


Expand Down
42 changes: 15 additions & 27 deletions ...de.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/XMLContentAssistProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,15 +364,12 @@ private ICompletionProposal[] computeAttributeProposal(IDocumentAttributeNode at

private ICompletionProposal[] computeCompletionProposal(IDocumentElementNode node, int offset, IDocument doc) {
int prop_type = determineAssistType(node, doc, offset);
switch (prop_type) {
case F_ADD_ATTRIB :
return computeAddAttributeProposal(F_INFER_BY_OBJECT, node, offset, doc, null, node.getXMLTagName());
case F_OPEN_TAG :
return computeOpenTagProposal(node, offset, doc);
case F_ADD_CHILD :
return computeAddChildProposal(node, offset, doc, null);
}
return null;
return switch (prop_type) {
case F_ADD_ATTRIB -> computeAddAttributeProposal(F_INFER_BY_OBJECT, node, offset, doc, null, node.getXMLTagName());
case F_OPEN_TAG -> computeOpenTagProposal(node, offset, doc);
case F_ADD_CHILD -> computeAddChildProposal(node, offset, doc, null);
default -> null;
};
}

private int determineAssistType(IDocumentElementNode node, IDocument doc, int offset) {
Expand Down Expand Up @@ -785,24 +782,15 @@ private IPluginModelBase getPluginModelBase() {

public Image getImage(int type) {
if (fImages[type] == null) {
switch (type) {
case F_EXTENSION_POINT :
case F_EXTENSION_ATTRIBUTE_POINT_VALUE :
return fImages[type] = PDEPluginImages.DESC_EXT_POINT_OBJ.createImage();
case F_EXTENSION_POINT_AND_VALUE :
case F_EXTENSION :
return fImages[type] = PDEPluginImages.DESC_EXTENSION_OBJ.createImage();
case F_ELEMENT :
case F_CLOSE_TAG :
return fImages[type] = PDEPluginImages.DESC_XML_ELEMENT_OBJ.createImage();
case F_ATTRIBUTE :
case F_ATTRIBUTE_VALUE :
return fImages[type] = PDEPluginImages.DESC_ATT_URI_OBJ.createImage();
case F_ATTRIBUTE_ID_VALUE :
return fImages[type] = PDEPluginImages.DESC_ATT_ID_OBJ.createImage();
case F_ATTRIBUTE_BOOLEAN_VALUE :
return fImages[type] = PDEPluginImages.DESC_ATT_BOOLEAN_OBJ.createImage();
}
fImages[type] = switch (type) {
case F_EXTENSION_POINT, F_EXTENSION_ATTRIBUTE_POINT_VALUE -> PDEPluginImages.DESC_EXT_POINT_OBJ.createImage();
case F_EXTENSION_POINT_AND_VALUE, F_EXTENSION -> PDEPluginImages.DESC_EXTENSION_OBJ.createImage();
case F_ELEMENT, F_CLOSE_TAG -> PDEPluginImages.DESC_XML_ELEMENT_OBJ.createImage();
case F_ATTRIBUTE, F_ATTRIBUTE_VALUE -> PDEPluginImages.DESC_ATT_URI_OBJ.createImage();
case F_ATTRIBUTE_ID_VALUE -> PDEPluginImages.DESC_ATT_ID_OBJ.createImage();
case F_ATTRIBUTE_BOOLEAN_VALUE -> PDEPluginImages.DESC_ATT_BOOLEAN_OBJ.createImage();
default -> fImages[type];
};
}
return fImages[type];
}
Expand Down
22 changes: 6 additions & 16 deletions ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/XMLInputContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,22 +417,12 @@ protected void printDeletionRange(int offset, int length) {
for (int i = 0; i < string.length(); i++) {
char c = string.charAt(i);
switch (c) {
case '\n':
buffer.append("\\n"); //$NON-NLS-1$
break;
case '\r':
buffer.append("\\r"); //$NON-NLS-1$
break;
case '\t':
buffer.append("\\t"); //$NON-NLS-1$
break;
case ' ':
buffer.append('*');
break;
default:
buffer.append(c);
break;
}
case '\n' -> buffer.append("\\n"); //$NON-NLS-1$
case '\r' -> buffer.append("\\r"); //$NON-NLS-1$
case '\t' -> buffer.append("\\t"); //$NON-NLS-1$
case ' ' -> buffer.append('*');
default -> buffer.append(c);
};
}
System.out.println(buffer.toString());
} catch (BadLocationException e) {
Expand Down