Fixes java-decompiler#56, "Bad <init> method call from inside of a br…

…anch"
yedan2010 · Jul 12, 2015 · bb5fe52 · bb5fe52
1 parent b1bba36
commit bb5fe52
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 0 deletions.
diff --git a/...ain/groovy/org/jd/gui/service/preferencespanel/UISingleInstancePreferencesProvider.groovy b/...ain/groovy/org/jd/gui/service/preferencespanel/UISingleInstancePreferencesProvider.groovy
@@ -5,6 +5,7 @@
 
 package org.jd.gui.service.preferencespanel
 
+import groovy.transform.CompileStatic
 import org.jd.gui.spi.PreferencesPanel
 
 import javax.swing.*
@@ -13,6 +14,7 @@ import java.awt.*
 /**
  * Single instance is the default mode on Mac OSX, so this panel is not activated.
  */
+@CompileStatic
 class UISingleInstancePreferencesProvider extends JPanel implements PreferencesPanel {
 
     static final String SINGLE_INSTANCE = 'UIMainWindowPreferencesProvider.singleInstance'

diff --git a/app/src/main/groovy/org/jd/gui/service/preferencespanel/UITabsPreferencesProvider.groovy b/app/src/main/groovy/org/jd/gui/service/preferencespanel/UITabsPreferencesProvider.groovy
@@ -5,6 +5,7 @@
 
 package org.jd.gui.service.preferencespanel
 
+import groovy.transform.CompileStatic
 import org.jd.gui.spi.PreferencesPanel
 
 import javax.swing.JCheckBox
@@ -16,6 +17,7 @@ import java.awt.GridLayout
  * JTabbedPane.WRAP_TAB_LAYOUT is not supported by Aqua L&F.
  * This panel is not activated on Mac OSX.
  */
+@CompileStatic
 class UITabsPreferencesProvider extends JPanel implements PreferencesPanel {
 
     static final String TAB_LAYOUT = 'UITabsPreferencesProvider.singleLineTabs'

diff --git a/.../main/groovy/org/jd/gui/service/preferencespanel/ClassFileSaverPreferencesProvider.groovy b/.../main/groovy/org/jd/gui/service/preferencespanel/ClassFileSaverPreferencesProvider.groovy
@@ -5,13 +5,15 @@
 
 package org.jd.gui.service.preferencespanel
 
+import groovy.transform.CompileStatic
 import org.jd.gui.spi.PreferencesPanel
 
 import javax.swing.JCheckBox
 import javax.swing.JPanel
 import java.awt.Color
 import java.awt.GridLayout
 
+@CompileStatic
 class ClassFileSaverPreferencesProvider extends JPanel implements PreferencesPanel {
 
     static final String ESCAPE_UNICODE_CHARACTERS = 'ClassFileSaverPreferences.escapeUnicodeCharacters'

diff --git a/...main/groovy/org/jd/gui/service/preferencespanel/ClassFileViewerPreferencesProvider.groovy b/...main/groovy/org/jd/gui/service/preferencespanel/ClassFileViewerPreferencesProvider.groovy
@@ -5,13 +5,15 @@
 
 package org.jd.gui.service.preferencespanel
 
+import groovy.transform.CompileStatic
 import org.jd.gui.spi.PreferencesPanel
 
 import javax.swing.JCheckBox
 import javax.swing.JPanel
 import java.awt.Color
 import java.awt.GridLayout
 
+@CompileStatic
 class ClassFileViewerPreferencesProvider extends JPanel implements PreferencesPanel {
     static final String ESCAPE_UNICODE_CHARACTERS = 'ClassFileViewerPreferences.escapeUnicodeCharacters'
     static final String OMIT_THIS_PREFIX = 'ClassFileViewerPreferences.omitThisPrefix'

diff --git a/...ain/groovy/org/jd/gui/service/preferencespanel/DirectoryIndexerPreferencesProvider.groovy b/...ain/groovy/org/jd/gui/service/preferencespanel/DirectoryIndexerPreferencesProvider.groovy
@@ -5,6 +5,7 @@
 
 package org.jd.gui.service.preferencespanel
 
+import groovy.transform.CompileStatic
 import org.jd.gui.spi.PreferencesPanel
 
 import javax.swing.JLabel
@@ -15,6 +16,7 @@ import javax.swing.event.DocumentListener
 import java.awt.BorderLayout
 import java.awt.Color
 
+@CompileStatic
 class DirectoryIndexerPreferencesProvider extends JPanel implements PreferencesPanel, DocumentListener {
     static final int MAX_VALUE = 30
     static final String MAXIMUM_DEPTH_KEY = 'DirectoryIndexerPreferences.maximumDepth'

diff --git a/...ices/src/main/groovy/org/jd/gui/service/preferencespanel/ViewerPreferencesProvider.groovy b/...ices/src/main/groovy/org/jd/gui/service/preferencespanel/ViewerPreferencesProvider.groovy
@@ -5,6 +5,7 @@
 
 package org.jd.gui.service.preferencespanel
 
+import groovy.transform.CompileStatic
 import org.jd.gui.spi.PreferencesPanel
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea
 import org.fife.ui.rsyntaxtextarea.Theme
@@ -14,6 +15,7 @@ import javax.swing.event.DocumentEvent
 import javax.swing.event.DocumentListener
 import java.awt.*
 
+@CompileStatic
 class ViewerPreferencesProvider extends JPanel implements PreferencesPanel, DocumentListener {
     static final int MIN_VALUE = 2
     static final int MAX_VALUE = 40