Skip to content

Commit 893fc9c

Browse files
author
chenzhuo
committed
Merge remote-tracking branch 'origin/master'
2 parents f40ed34 + 7a34876 commit 893fc9c

34 files changed

Lines changed: 403 additions & 45 deletions

.idea/compiler.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/com/basics/ThreadCode/ThreadConection/ArrayListMultThread.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
import java.util.ArrayList;
44

5+
/**
6+
* @author demons
7+
*/
58
public class ArrayListMultThread {
69
public static ArrayList<Integer> list = new ArrayList<>();
710

src/main/java/com/basics/AtomicLongTest/AtomicLongTest.java renamed to src/main/java/com/basics/atomiclongtest/AtomicLongTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.basics.AtomicLongTest;
1+
package com.basics.atomiclongtest;
22

33
import java.util.concurrent.atomic.AtomicLong;
44

55
/**
6-
* PACKAGE_NAME: com.basics.AtomicLongTest
6+
* PACKAGE_NAME: com.basics.atomiclongtest
77
* MONTH_NAME_SHORT: 四月
88
* USER: Clement
99
**/

src/main/java/com/basics/baseCodeValue/CodeMain.java renamed to src/main/java/com/basics/basecodevalue/CodeMain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.basics.baseCodeValue;
1+
package com.basics.basecodevalue;
22
/**
33
* @ClassName CodeMain
44
* @Description TODO

src/main/java/com/basics/ClassLoaderTest/BootstrapClassloaderTest/BootstrapClassloaderTest.java renamed to src/main/java/com/basics/classloadertest/BootstrapClassloaderTest/BootstrapClassloaderTest.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
package com.basics.ClassLoaderTest.BootstrapClassloaderTest;
2-
3-
import sun.security.action.GetPropertyAction;
4-
5-
import java.security.AccessController;
1+
package com.basics.classloadertest.BootstrapClassloaderTest;
62

73
/**
84
* @ClassName BootstrapClassloaderTest

src/main/java/com/basics/ClassLoaderTest/ClassLoaderLoadClass.java renamed to src/main/java/com/basics/classloadertest/ClassLoaderLoadClass.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.basics.ClassLoaderTest;
1+
package com.basics.classloadertest;
22

33
import java.net.URL;
44
import java.net.URLClassLoader;
55

66
/**
7-
* @PACKAGE_NAME: com.basics.ClassLoaderTest
7+
* @PACKAGE_NAME: com.basics.classloadertest
88
* @PROJECT_NAME: JavaCode
99
* @Date: 2018/4/20
1010
* @author: Jossc

src/main/java/com/basics/ClassLoaderTest/ClassLoaderMain.java renamed to src/main/java/com/basics/classloadertest/ClassLoaderMain.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
package com.basics.ClassLoaderTest;
1+
package com.basics.classloadertest;
22

3-
import java.lang.reflect.InvocationTargetException;
43
import java.lang.reflect.Method;
54
import java.net.URLClassLoader;
6-
import java.util.ArrayList;
7-
import java.util.List;
85

96
/**
10-
* @PACKAGE_NAME: com.basics.ClassLoaderTest
7+
* @PACKAGE_NAME: com.basics.classloadertest
118
* @PROJECT_NAME: JavaCode
129
* @Date: 2018/4/20
1310
* @author: Jossc

src/main/java/com/basics/ClassLoaderTest/ClassLoaderManager.java renamed to src/main/java/com/basics/classloadertest/ClassLoaderManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.basics.ClassLoaderTest;
1+
package com.basics.classloadertest;
22

33
import java.io.File;
44
import java.net.URL;
@@ -12,7 +12,7 @@
1212
import java.util.jar.JarFile;
1313

1414
/**
15-
* @PACKAGE_NAME: com.basics.ClassLoaderTest
15+
* @PACKAGE_NAME: com.basics.classloadertest
1616
* @PROJECT_NAME: JavaCode
1717
* @Date: 2018/4/20
1818
* @author: Jossc

src/main/java/com/basics/ClassLoaderTest/ClassLoaderTestOne.java renamed to src/main/java/com/basics/classloadertest/ClassLoaderTestOne.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.basics.ClassLoaderTest;
1+
package com.basics.classloadertest;
22

33
import java.net.URL;
44

55
/**
6-
* @PACKAGE_NAME: com.basics.ClassLoaderTest
6+
* @PACKAGE_NAME: com.basics.classloadertest
77
* @PROJECT_NAME: JavaCode
88
* @Date: 2018/4/20
99
* @author: Jossc

0 commit comments

Comments
 (0)