Skip to content

Commit 235cb2b

Browse files
committed
Merge pull request #2 from mgsx-dev/fix/java-compatibility
Fix/java compatibility
2 parents 2effd39 + 7dc6823 commit 235cb2b

File tree

7 files changed

+16
-10
lines changed

7 files changed

+16
-10
lines changed

cc.openframeworks.plugin/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry kind="output" path="bin"/>

cc.openframeworks.plugin/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/bin/
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
4-
org.eclipse.jdt.core.compiler.compliance=1.8
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
4+
org.eclipse.jdt.core.compiler.compliance=1.7
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7-
org.eclipse.jdt.core.compiler.source=1.8
7+
org.eclipse.jdt.core.compiler.source=1.7

cc.openframeworks.plugin/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.jface.text,
1111
org.eclipse.core.runtime,
1212
org.eclipse.cdt.managedbuilder.core,
1313
org.eclipse.cdt.core
14-
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
14+
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
1515
Bundle-Vendor: openFrameworks
1616
Export-Package: cc.openframeworks.plugin,
1717
cc.openframeworks.plugin.wizards

cc.openframeworks.plugin/src/cc/openframeworks/plugin/PropertyPage.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public boolean performOk() {
149149
((IResource) getElement()).setPersistentProperty(
150150
new QualifiedName("", "OF_ROOT"),
151151
ofRoot);
152-
IProject project = ((IResource) getElement()).getProject();
152+
final IProject project = ((IResource) getElement()).getProject();
153153
IManagedBuildInfo buildInfo = ManagedBuildManager.getBuildInfo(project);
154154
IConfiguration debugConfig = buildInfo.getManagedProject().getConfiguration("cc.openframeworks.configurations.debug");
155155
IBuilder bld = debugConfig.getEditableBuilder();
@@ -172,7 +172,7 @@ public boolean performOk() {
172172
}else{
173173
bld.setIncrementalBuildTarget("Release");
174174
}
175-
WorkspaceModifyOperation op = new WorkspaceModifyOperation() {
175+
final WorkspaceModifyOperation op = new WorkspaceModifyOperation() {
176176
public void execute(IProgressMonitor monitor) throws CoreException{
177177
try {
178178
project.build(project.getActiveBuildConfig(),IncrementalProjectBuilder.CLEAN_BUILD,monitor);
@@ -188,7 +188,10 @@ public void execute(IProgressMonitor monitor) throws CoreException{
188188
public void run(IProgressMonitor monitor) throws CoreException {
189189
try {
190190
op.run(monitor);
191-
} catch (InvocationTargetException | InterruptedException e) {
191+
} catch (InvocationTargetException e) {
192+
// TODO Auto-generated catch block
193+
e.printStackTrace();
194+
} catch (InterruptedException e) {
192195
// TODO Auto-generated catch block
193196
e.printStackTrace();
194197
}

cc.openframeworks.plugin/src/cc/openframeworks/plugin/Utils.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ public static void reparseAddons(IProject project, String[] newAddons, String of
8888
}
8989
}
9090
bw.close();
91-
} catch (IOException | URISyntaxException e) {
91+
} catch (URISyntaxException e) {
92+
throwCoreException(e.getMessage());
93+
} catch (IOException e) {
9294
throwCoreException(e.getMessage());
9395
}
9496
}

cc.openframeworks.plugin/src/cc/openframeworks/plugin/wizards/SelectAddonPage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void createControl(Composite parent) {
108108
addonsNames.add(f.getName());
109109
}
110110
}
111-
addonsNames.sort(new Comparator<String>() {
111+
Collections.sort(addonsNames, new Comparator<String>() {
112112
@Override
113113
public int compare(String o1, String o2) {
114114
return o1.compareTo(o2);

0 commit comments

Comments
 (0)