6502/wudsn-ide
1
0
Fork 0
mirror of https://github.com/peterdell/wudsn-ide.git synced 2024-05-31 17:41:28 +00:00
Code Issues Projects Releases Wiki Activity

Adapt to Eclipse 4.12 and Java 8

Browse Source
This commit is contained in:
peterdell 2019-08-31 02:00:21 +02:00
parent 30ef1fe2a8
commit 3686357c6e
6 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
com.wudsn.ide.asm/META-INF/MANIFEST.MF
View File

@ -42,6 +42,8 @@ Export-Package: com.wudsn.ide.asm;
com.wudsn.ide.asm,
org.eclipse.jface.text.rules",
com.wudsn.ide.asm.compiler.parser,
com.wudsn.ide.asm.compiler.syntax,
com.wudsn.ide.asm.compiler.writer,
com.wudsn.ide.asm.editor;
uses:="org.eclipse.jface.text,
org.eclipse.core.runtime,
@ -69,6 +71,7 @@ Export-Package: com.wudsn.ide.asm;
org.eclipse.jface.util,
org.eclipse.swt.widgets,
org.eclipse.ui.editors.text",
com.wudsn.ide.asm.help,
com.wudsn.ide.asm.preferences;
uses:="org.eclipse.jface.text,
org.eclipse.jface.preference,

4
com.wudsn.ide.asm/src/com/wudsn/ide/asm/AssemblerPlugin.java
View File

@ -60,7 +60,7 @@ public final class AssemblerPlugin extends AbstractIDEPlugin {
* The preferences.
*/
private AssemblerPreferences preferences;
private ListenerList preferencesChangeListeners;
private ListenerList<AssemblerPreferencesChangeListener> preferencesChangeListeners;
/**
* The compiler registry.
@ -87,7 +87,7 @@ public final class AssemblerPlugin extends AbstractIDEPlugin {
*/
public AssemblerPlugin() {
preferences = null;
preferencesChangeListeners = new ListenerList(ListenerList.IDENTITY);
preferencesChangeListeners = new ListenerList<AssemblerPreferencesChangeListener>(ListenerList.IDENTITY);
compilerRegistry = new CompilerRegistry();
compilerConsole = null;
runnerRegistry = new RunnerRegistry();

20
com.wudsn.ide.asm/src/com/wudsn/ide/asm/editor/AssemblerBreakpointsTarget.java
View File

@ -43,9 +43,9 @@ public final class AssemblerBreakpointsTarget implements IToggleBreakpointsTarge
/*
* (non-Javadoc)
*
* @see
* org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleLineBreakpoints
* (org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#
* toggleLineBreakpoints (org.eclipse.ui.IWorkbenchPart,
* org.eclipse.jface.viewers.ISelection)
*/
@Override
public void toggleLineBreakpoints(IWorkbenchPart part, ISelection selection) throws CoreException {
@ -54,7 +54,7 @@ public final class AssemblerBreakpointsTarget implements IToggleBreakpointsTarge
IBreakpointManager breakPointManager = DebugPlugin.getDefault().getBreakpointManager();
String editorId = assemblerEditor.getClass().getName();
IEditorInput editorInput = assemblerEditor.getEditorInput();
IResource resource = (IResource) editorInput.getAdapter(IResource.class);
IResource resource = editorInput.getAdapter(IResource.class);
ITextSelection textSelection = (ITextSelection) selection;
int lineNumber = textSelection.getStartLine();
IBreakpoint[] breakpoints = breakPointManager.getBreakpoints(AssemblerBreakpoint.DEBUG_MODEL_ID);
@ -106,9 +106,9 @@ public final class AssemblerBreakpointsTarget implements IToggleBreakpointsTarge
/*
* (non-Javadoc)
*
* @see
* org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleMethodBreakpoints
* (org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#
* toggleMethodBreakpoints (org.eclipse.ui.IWorkbenchPart,
* org.eclipse.jface.viewers.ISelection)
*/
@Override
public void toggleMethodBreakpoints(IWorkbenchPart part, ISelection selection) throws CoreException {
@ -140,9 +140,9 @@ public final class AssemblerBreakpointsTarget implements IToggleBreakpointsTarge
/*
* (non-Javadoc)
*
* @see
* org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleWatchpoints
* (org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
* @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#
* canToggleWatchpoints (org.eclipse.ui.IWorkbenchPart,
* org.eclipse.jface.viewers.ISelection)
*/
@Override
public boolean canToggleWatchpoints(IWorkbenchPart part, ISelection selection) {

5
com.wudsn.ide.asm/src/com/wudsn/ide/asm/editor/AssemblerEditor.java
View File

@ -304,8 +304,9 @@ public abstract class AssemblerEditor extends TextEditor {
super.dispose();
}
@SuppressWarnings("unchecked")
@Override
public final Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
public <T> T getAdapter(Class<T> adapter) {
if (IContentOutlinePage.class.equals(adapter)) {
if (contentOutlinePage == null) {
contentOutlinePage = new AssemblerContentOutlinePage(this);
@ -313,7 +314,7 @@ public abstract class AssemblerEditor extends TextEditor {
// currently.
updateContentOutlinePage();
}
return contentOutlinePage;
return (T)contentOutlinePage;
}
return super.getAdapter(adapter);
}

24
com.wudsn.ide.asm/src/com/wudsn/ide/asm/editor/AssemblerHyperlinkDetector.java
View File

@ -101,7 +101,7 @@ public final class AssemblerHyperlinkDetector extends AbstractHyperlinkDetector
AssemblerEditor assemblerEditor;
assemblerEditor = (AssemblerEditor) getAdapter(AssemblerEditor.class);
assemblerEditor = getAdapter(AssemblerEditor.class);
if (assemblerEditor == null) {
return null;
}
@ -203,17 +203,17 @@ public final class AssemblerHyperlinkDetector extends AbstractHyperlinkDetector
switch (fileReference.getType()) {
case CompilerSourceParserFileReferenceType.SOURCE:
hyperlinks
.add(new AssemblerHyperlink(linkRegion, workbenchPage, absoluteFilePath, uri, assemblerEditor
.getClass().getName(), 0,
Texts.ASSEMBLER_HYPERLINK_DETECTOR_OPEN_SOURCE_WITH_ASSEMBLER_EDITOR));
hyperlinks.add(new AssemblerHyperlink(linkRegion, workbenchPage, absoluteFilePath, uri,
assemblerEditor.getClass().getName(), 0,
Texts.ASSEMBLER_HYPERLINK_DETECTOR_OPEN_SOURCE_WITH_ASSEMBLER_EDITOR));
break;
case CompilerSourceParserFileReferenceType.BINARY:
hyperlinks.add(new AssemblerHyperlink(linkRegion, workbenchPage, absoluteFilePath, uri, HexEditor.ID,
0, Texts.ASSEMBLER_HYPERLINK_DETECTOR_OPEN_BINARY_WITH_HEX_EDITOR));
hyperlinks.add(new AssemblerHyperlink(linkRegion, workbenchPage, absoluteFilePath, uri, HexEditor.ID, 0,
Texts.ASSEMBLER_HYPERLINK_DETECTOR_OPEN_BINARY_WITH_HEX_EDITOR));
if (canShowMultipleHyperlinks) {
hyperlinks.add(new AssemblerHyperlink(linkRegion, workbenchPage, absoluteFilePath, uri,
GraphicsConversionEditor.ID, 0, Texts.ASSEMBLER_HYPERLINK_DETECTOR_OPEN_BINARY_WITH_GRAPHICS_EDITOR));
GraphicsConversionEditor.ID, 0,
Texts.ASSEMBLER_HYPERLINK_DETECTOR_OPEN_BINARY_WITH_GRAPHICS_EDITOR));
hyperlinks.add(new AssemblerHyperlink(linkRegion, workbenchPage, absoluteFilePath, uri,
AssemblerHyperlink.DEFAULT_EDITOR, 0,
Texts.ASSEMBLER_HYPERLINK_DETECTOR_OPEN_BINARY_WITH_DEFAULT_EDITOR));
@ -229,8 +229,8 @@ public final class AssemblerHyperlinkDetector extends AbstractHyperlinkDetector
}
}
private static void detectIdentifier(AssemblerEditor assemblerEditor, IRegion lineInfo, int lineNumber,
String line, int offsetInLine, boolean canShowMultipleHyperlinks, List<AssemblerHyperlink> hyperlinks) {
private static void detectIdentifier(AssemblerEditor assemblerEditor, IRegion lineInfo, int lineNumber, String line,
int offsetInLine, boolean canShowMultipleHyperlinks, List<AssemblerHyperlink> hyperlinks) {
CompilerSyntax compilerSyntax = assemblerEditor.createCompilerSourceParser().getCompilerSyntax();
@ -324,8 +324,8 @@ public final class AssemblerHyperlinkDetector extends AbstractHyperlinkDetector
CompilerSourceParserTreeObjectType.getText(element.getType()), element.getCompoundName(),
NumberUtility.getLongValueDecimalString(elementLineNumber), fileName);
}
hyperlinks.add(new AssemblerHyperlink(linkRegion, workbenchPage, absoluteFilePath, uri, assemblerEditor
.getClass().getName(), elementLineNumber, hyperlinkText));
hyperlinks.add(new AssemblerHyperlink(linkRegion, workbenchPage, absoluteFilePath, uri,
assemblerEditor.getClass().getName(), elementLineNumber, hyperlinkText));
}
}

1
com.wudsn.ide.asm/src/com/wudsn/ide/asm/editor/AssemblerSourceViewerConfiguration.java
View File

@ -214,7 +214,6 @@ final class AssemblerSourceViewerConfiguration extends TextSourceViewerConfigura
return reconciler;
}
@SuppressWarnings("unchecked")
@Override
protected Map<String, IAdaptable> getHyperlinkDetectorTargets(ISourceViewer sourceViewer) {
Map<String, IAdaptable> targets = super.getHyperlinkDetectorTargets(sourceViewer);