Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jadx
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open-source
jadx
Commits
aa8a7c03
Unverified
Commit
aa8a7c03
authored
Mar 26, 2019
by
skylot
Committed by
GitHub
Mar 26, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
style: enforce strict style rules with editorconfig (PR #510)
parent
36ee994e
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
561 additions
and
561 deletions
+561
-561
.editorconfig
.editorconfig
+22
-0
build.gradle
build.gradle
+105
-92
JadxCLIArgs.java
jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java
+1
-1
logback.xml
jadx-cli/src/main/resources/logback.xml
+11
-13
JadxArgs.java
jadx-core/src/main/java/jadx/api/JadxArgs.java
+1
-2
NotYetImplemented.java
jadx-core/src/test/java/jadx/NotYetImplemented.java
+4
-4
TestImportGenericMap.java
...jadx/tests/integration/generics/TestImportGenericMap.java
+13
-14
logback.xml
jadx-core/src/test/resources/logback.xml
+8
-8
JPackage.java
jadx-gui/src/main/java/jadx/gui/treemodel/JPackage.java
+3
-5
MainWindow.java
jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
+20
-47
LineNumbers.java
jadx-gui/src/main/java/jadx/gui/ui/codearea/LineNumbers.java
+226
-226
NLS.java
jadx-gui/src/main/java/jadx/gui/utils/NLS.java
+108
-108
build.gradle
jadx-samples/build.gradle
+25
-25
TestInitializers.java
...-samples/src/main/java/jadx/samples/TestInitializers.java
+10
-11
TestInner3.java
jadx-samples/src/main/java/jadx/samples/TestInner3.java
+4
-5
No files found.
.editorconfig
0 → 100644
View file @
aa8a7c03
# EditorConfig is awesome: https://EditorConfig.org
root = true
[*]
end_of_line = lf
insert_final_newline = true
indent_style = tab
tab_width = 4
charset = utf-8
trim_trailing_whitespace = true
[*.xml]
indent_size = 1
[*.yml]
indent_style = space
indent_size = 2
[*.bat]
end_of_line = crlf
build.gradle
View file @
aa8a7c03
plugins
{
plugins
{
id
'org.sonarqube'
version
'2.7'
id
'org.sonarqube'
version
'2.7'
id
'com.github.ben-manes.versions'
version
'0.21.0'
id
'com.github.ben-manes.versions'
version
'0.21.0'
id
'org.ec4j.editorconfig'
version
'0.0.3'
}
}
ext
.
jadxVersion
=
System
.
getenv
(
'JADX_VERSION'
)
?:
"dev"
ext
.
jadxVersion
=
System
.
getenv
(
'JADX_VERSION'
)
?:
"dev"
...
@@ -74,6 +75,16 @@ sonarqube {
...
@@ -74,6 +75,16 @@ sonarqube {
}
}
}
}
editorconfig
{
excludes
=
[
'gradle/'
,
'jadx-test-app/test-app'
// ignore issues in submodule
,
'**/out/'
// IntelliJ Idea build dirs
,
'**/certificate-test/'
// binary test files (.RSA)
,
'**/*.svg'
,
'**/*.arsc'
]
}
dependencyUpdates
.
resolutionStrategy
=
{
dependencyUpdates
.
resolutionStrategy
=
{
componentSelection
{
rules
->
componentSelection
{
rules
->
rules
.
all
{
ComponentSelection
selection
->
rules
.
all
{
ComponentSelection
selection
->
...
@@ -126,7 +137,9 @@ task cleanBuildDir(type: Delete) {
...
@@ -126,7 +137,9 @@ task cleanBuildDir(type: Delete) {
delete
buildDir
delete
buildDir
}
}
build
.
dependsOn
(
dist
,
samples
)
check
.
dependsOn
editorconfigCheck
test
.
dependsOn
(
samples
)
clean
.
dependsOn
(
cleanBuildDir
)
clean
.
dependsOn
(
cleanBuildDir
)
jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java
View file @
aa8a7c03
jadx-cli/src/main/resources/logback.xml
View file @
aa8a7c03
<configuration>
<configuration>
<appender
name=
"STDOUT"
class=
"ch.qos.logback.core.ConsoleAppender"
>
<appender
name=
"STDOUT"
class=
"ch.qos.logback.core.ConsoleAppender"
>
<filter
class=
"ch.qos.logback.classic.filter.ThresholdFilter"
>
<filter
class=
"ch.qos.logback.classic.filter.ThresholdFilter"
>
<level>
INFO
</level>
<level>
INFO
</level>
...
@@ -12,5 +11,4 @@
...
@@ -12,5 +11,4 @@
<root
level=
"DEBUG"
>
<root
level=
"DEBUG"
>
<appender-ref
ref=
"STDOUT"
/>
<appender-ref
ref=
"STDOUT"
/>
</root>
</root>
</configuration>
</configuration>
jadx-core/src/main/java/jadx/api/JadxArgs.java
View file @
aa8a7c03
...
@@ -257,5 +257,4 @@ public class JadxArgs {
...
@@ -257,5 +257,4 @@ public class JadxArgs {
sb
.
append
(
'}'
);
sb
.
append
(
'}'
);
return
sb
.
toString
();
return
sb
.
toString
();
}
}
}
}
jadx-core/src/test/java/jadx/NotYetImplemented.java
View file @
aa8a7c03
jadx-core/src/test/java/jadx/tests/integration/generics/TestImportGenericMap.java
View file @
aa8a7c03
package
jadx
.
tests
.
integration
.
generics
;
package
jadx
.
tests
.
integration
.
generics
;
import
static
org
.
hamcrest
.
CoreMatchers
.
containsString
;
import
static
org
.
hamcrest
.
CoreMatchers
.
not
;
import
static
org
.
hamcrest
.
MatcherAssert
.
assertThat
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.tests.api.IntegrationTest
;
import
jadx.tests.api.IntegrationTest
;
import
static
org
.
hamcrest
.
CoreMatchers
.
containsString
;
import
static
org
.
hamcrest
.
CoreMatchers
.
not
;
import
static
org
.
hamcrest
.
MatcherAssert
.
assertThat
;
public
class
TestImportGenericMap
extends
IntegrationTest
{
public
class
TestImportGenericMap
extends
IntegrationTest
{
@Test
@Test
...
@@ -36,5 +36,4 @@ final class SuperClass<O extends SuperClass.ToImport> {
...
@@ -36,5 +36,4 @@ final class SuperClass<O extends SuperClass.ToImport> {
public
<
C
extends
NotToImport
>
SuperClass
(
Class1
<
C
>
zzf
)
{
public
<
C
extends
NotToImport
>
SuperClass
(
Class1
<
C
>
zzf
)
{
}
}
}
}
jadx-core/src/test/resources/logback.xml
View file @
aa8a7c03
jadx-gui/src/main/java/jadx/gui/treemodel/JPackage.java
View file @
aa8a7c03
package
jadx
.
gui
.
treemodel
;
package
jadx
.
gui
.
treemodel
;
import
javax.swing.*
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
javax.swing.Icon
;
import
javax.swing.ImageIcon
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.annotations.NotNull
;
import
jadx.api.JavaClass
;
import
jadx.api.JavaClass
;
...
...
jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
View file @
aa8a7c03
package
jadx
.
gui
.
ui
;
package
jadx
.
gui
.
ui
;
import
static
javax
.
swing
.
KeyStroke
.
getKeyStroke
;
import
javax.swing.*
;
import
javax.swing.event.MenuEvent
;
import
java.awt.BorderLayout
;
import
javax.swing.event.MenuListener
;
import
java.awt.Component
;
import
javax.swing.event.TreeExpansionEvent
;
import
java.awt.DisplayMode
;
import
javax.swing.event.TreeWillExpandListener
;
import
java.awt.Font
;
import
javax.swing.filechooser.FileNameExtensionFilter
;
import
java.awt.GraphicsDevice
;
import
javax.swing.tree.DefaultMutableTreeNode
;
import
java.awt.GraphicsEnvironment
;
import
javax.swing.tree.DefaultTreeCellRenderer
;
import
javax.swing.tree.DefaultTreeModel
;
import
javax.swing.tree.TreeNode
;
import
javax.swing.tree.TreePath
;
import
javax.swing.tree.TreeSelectionModel
;
import
java.awt.*
;
import
java.awt.dnd.DnDConstants
;
import
java.awt.dnd.DnDConstants
;
import
java.awt.dnd.DropTarget
;
import
java.awt.dnd.DropTarget
;
import
java.awt.event.ActionEvent
;
import
java.awt.event.ActionEvent
;
...
@@ -22,38 +27,6 @@ import java.util.Arrays;
...
@@ -22,38 +27,6 @@ import java.util.Arrays;
import
java.util.Timer
;
import
java.util.Timer
;
import
java.util.TimerTask
;
import
java.util.TimerTask
;
import
javax.swing.AbstractAction
;
import
javax.swing.Action
;
import
javax.swing.Box
;
import
javax.swing.ImageIcon
;
import
javax.swing.JCheckBoxMenuItem
;
import
javax.swing.JFileChooser
;
import
javax.swing.JFrame
;
import
javax.swing.JMenu
;
import
javax.swing.JMenuBar
;
import
javax.swing.JMenuItem
;
import
javax.swing.JPanel
;
import
javax.swing.JPopupMenu
;
import
javax.swing.JScrollPane
;
import
javax.swing.JSplitPane
;
import
javax.swing.JToggleButton
;
import
javax.swing.JToolBar
;
import
javax.swing.JTree
;
import
javax.swing.ProgressMonitor
;
import
javax.swing.SwingUtilities
;
import
javax.swing.WindowConstants
;
import
javax.swing.event.MenuEvent
;
import
javax.swing.event.MenuListener
;
import
javax.swing.event.TreeExpansionEvent
;
import
javax.swing.event.TreeWillExpandListener
;
import
javax.swing.filechooser.FileNameExtensionFilter
;
import
javax.swing.tree.DefaultMutableTreeNode
;
import
javax.swing.tree.DefaultTreeCellRenderer
;
import
javax.swing.tree.DefaultTreeModel
;
import
javax.swing.tree.TreeNode
;
import
javax.swing.tree.TreePath
;
import
javax.swing.tree.TreeSelectionModel
;
import
org.fife.ui.rsyntaxtextarea.Theme
;
import
org.fife.ui.rsyntaxtextarea.Theme
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -83,6 +56,8 @@ import jadx.gui.utils.Link;
...
@@ -83,6 +56,8 @@ import jadx.gui.utils.Link;
import
jadx.gui.utils.NLS
;
import
jadx.gui.utils.NLS
;
import
jadx.gui.utils.Utils
;
import
jadx.gui.utils.Utils
;
import
static
javax
.
swing
.
KeyStroke
.
getKeyStroke
;
@SuppressWarnings
(
"serial"
)
@SuppressWarnings
(
"serial"
)
public
class
MainWindow
extends
JFrame
{
public
class
MainWindow
extends
JFrame
{
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
MainWindow
.
class
);
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
MainWindow
.
class
);
...
@@ -608,8 +583,7 @@ public class MainWindow extends JFrame {
...
@@ -608,8 +583,7 @@ public class MainWindow extends JFrame {
public
void
mouseClicked
(
MouseEvent
e
)
{
public
void
mouseClicked
(
MouseEvent
e
)
{
if
(
SwingUtilities
.
isRightMouseButton
(
e
))
{
if
(
SwingUtilities
.
isRightMouseButton
(
e
))
{
treeRightClickAction
(
e
);
treeRightClickAction
(
e
);
}
}
else
{
else
{
treeClickAction
();
treeClickAction
();
}
}
}
}
...
@@ -791,8 +765,7 @@ public class MainWindow extends JFrame {
...
@@ -791,8 +765,7 @@ public class MainWindow extends JFrame {
String
fullName
=
pkg
.
getFullName
();
String
fullName
=
pkg
.
getFullName
();
if
(
excludeItem
.
isSelected
())
{
if
(
excludeItem
.
isSelected
())
{
wrapper
.
addExcludedPackage
(
fullName
);
wrapper
.
addExcludedPackage
(
fullName
);
}
}
else
{
else
{
wrapper
.
removeExcludedPackage
(
fullName
);
wrapper
.
removeExcludedPackage
(
fullName
);
}
}
reOpenFile
();
reOpenFile
();
...
...
jadx-gui/src/main/java/jadx/gui/ui/codearea/LineNumbers.java
View file @
aa8a7c03
jadx-gui/src/main/java/jadx/gui/utils/NLS.java
View file @
aa8a7c03
jadx-samples/build.gradle
View file @
aa8a7c03
jadx-samples/src/main/java/jadx/samples/TestInitializers.java
View file @
aa8a7c03
...
@@ -100,5 +100,4 @@ public class TestInitializers extends AbstractTest {
...
@@ -100,5 +100,4 @@ public class TestInitializers extends AbstractTest {
public
static
void
main
(
String
[]
args
)
throws
Exception
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
new
TestInitializers
().
testRun
();
new
TestInitializers
().
testRun
();
}
}
}
}
jadx-samples/src/main/java/jadx/samples/TestInner3.java
View file @
aa8a7c03
...
@@ -9,7 +9,7 @@ public class TestInner3 extends AbstractTest {
...
@@ -9,7 +9,7 @@ public class TestInner3 extends AbstractTest {
protected
String
a
;
protected
String
a
;
public
A
()
{
public
A
()
{
a
=
""
;
a
=
""
;
}
}
public
String
a
()
{
public
String
a
()
{
...
@@ -82,5 +82,4 @@ public class TestInner3 extends AbstractTest {
...
@@ -82,5 +82,4 @@ public class TestInner3 extends AbstractTest {
public
static
void
main
(
String
[]
args
)
throws
Exception
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
new
TestInner2
().
testRun
();
new
TestInner2
().
testRun
();
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment