diff --git a/.gitignore b/.gitignore index 397e45275..b16e70ac1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,130 @@ -nbproject/private/ -build/ -nbbuild/ -dist/ -nbdist/ -nbactions.xml -nb-configuration.xml -*.db +#---------------------------------------# +# Project Ignores # +#---------------------------------------# + +# Maven +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties + +!/.mvn/wrapper/maven-wrapper.jar + +# Compiled class file *.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files *.jar *.war -*.ear \ No newline at end of file +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# misc +*.log +log/ +logs/ + + +#---------------------------------------# +# IDEs & Editors Ignores # +#---------------------------------------# + +# Sublime Text +/*.sublime* +.sublime-gulp.cache + +# VS Code +/.vscode + +# JetBrains IDEs +.idea/ +*.iml + +# Eclipse +.project +.classpath +.settings + +# Netbeans +nbactions*.xml +nb-configuration*.xml + +# BlueJ +*.ctxt + + +#---------------------------------------# +# General Ignores # +#---------------------------------------# + +*~ +*.orig +.vagrant + + +#---------------------------------------# +# Linux Ignores # +#---------------------------------------# + +# KDE directory preferences +.directory + + +#---------------------------------------# +# OSX Ignores # +#---------------------------------------# + +.DS_Store +.AppleDouble +.LSOverride +.localized + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear on external disk +.Spotlight-V100 +.Trashes + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + + +#---------------------------------------# +# Windows Ignores # +#---------------------------------------# + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +#MegaBasterd DB +*.db diff --git a/build.xml b/build.xml deleted file mode 100644 index 24b65439a..000000000 --- a/build.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - Builds, tests, and runs the project MegaBasterd. - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib.zip b/lib.zip deleted file mode 100644 index cc95fca55..000000000 Binary files a/lib.zip and /dev/null differ diff --git a/manifest.mf b/manifest.mf deleted file mode 100644 index 155ec901d..000000000 --- a/manifest.mf +++ /dev/null @@ -1,4 +0,0 @@ -Manifest-Version: 1.0 -SplashScreen-Image: megabasterd/dot_com.png -X-COMMENT: Main-Class will be added automatically by build - diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml deleted file mode 100644 index 2dc1ddff7..000000000 --- a/nbproject/build-impl.xml +++ /dev/null @@ -1,1420 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No tests executed. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set JVM to use for profiling in profiler.info.jvm - Must set profiler agent JVM arguments in profiler.info.jvmargs.agent - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - java -jar "${dist.jar.resolved}" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - Must select one file in the IDE or set profile.class - This target only works when run from inside the NetBeans IDE. - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - - - Must select some files in the IDE or set test.includes - - - - - Must select one file in the IDE or set run.class - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - Must select some files in the IDE or set test.class - Must select some method in the IDE or set test.method - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - Must select one file in the IDE or set test.class - Must select some method in the IDE or set test.method - - - - - - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties deleted file mode 100644 index e264d89b8..000000000 --- a/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=71569f25 -build.xml.script.CRC32=cf2d2409 -build.xml.stylesheet.CRC32=8064a381@1.75.2.48 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=84d88617 -nbproject/build-impl.xml.script.CRC32=98c0e417 -nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48 diff --git a/nbproject/project.properties b/nbproject/project.properties deleted file mode 100644 index ebbc6f37b..000000000 --- a/nbproject/project.properties +++ /dev/null @@ -1,103 +0,0 @@ -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=false -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -application.title=MegaBasterd -application.vendor=tonikelope -build.classes.dir=${build.dir}/classes -build.classes.excludes=**/*.java,**/*.form -# This directory is removed when the project is cleaned: -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -# Only compile against the classpath explicitly listed here: -build.sysclasspath=ignore -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -# Uncomment to specify the preferred debugger connection transport: -#debug.transport=dt_socket -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} -# Files in build.classes.dir which should be excluded from distribution jar -dist.archive.excludes= -# This directory is removed when the project is cleaned: -dist.dir=dist -dist.jar=${dist.dir}/MegaBasterd.jar -dist.javadoc.dir=${dist.dir}/javadoc -endorsed.classpath= -excludes= -file.reference.jackson-core-asl-1.9.13.jar=jackson-core-asl-1.9.13.jar -file.reference.jackson-mapper-asl-1.9.13.jar=jackson-mapper-asl-1.9.13.jar -file.reference.sqlite-jdbc-3.8.11.2.jar=sqlite-jdbc-3.8.11.2.jar -includes=** -jar.archive.disabled=${jnlp.enabled} -jar.compress=false -jar.index=${jnlp.enabled} -javac.classpath=\ - ${file.reference.sqlite-jdbc-3.8.11.2.jar}:\ - ${file.reference.jackson-core-asl-1.9.13.jar}:\ - ${file.reference.jackson-mapper-asl-1.9.13.jar}:\ - ${libs.ApacheHttpClient.classpath}:\ - ${libs.absolutelayout.classpath} -# Space-separated list of extra javac options -javac.compilerargs= -javac.deprecation=false -javac.external.vm=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.7 -javac.target=1.7 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -jnlp.codebase.type=no.codebase -jnlp.descriptor=application -jnlp.enabled=false -jnlp.mixed.code=default -jnlp.offline-allowed=false -jnlp.signed=false -jnlp.signing= -jnlp.signing.alias= -jnlp.signing.keystore= -main.class=megabasterd.MainPanel -# Optional override of default Application-Library-Allowable-Codebase attribute identifying the locations where your signed RIA is expected to be found. -manifest.custom.application.library.allowable.codebase= -# Optional override of default Caller-Allowable-Codebase attribute identifying the domains from which JavaScript code can make calls to your RIA without security prompts. -manifest.custom.caller.allowable.codebase= -# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed -manifest.custom.codebase= -# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions) -manifest.custom.permissions= -manifest.file=manifest.mf -meta.inf.dir=${src.dir}/META-INF -mkdist.disabled=false -platform.active=default_platform -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -# Space-separated list of JVM arguments used when running the project. -# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value. -# To set system properties for unit tests define test-sys-prop.name=value: -run.jvmargs=-splash:src/megabasterd/dot_com.png -Djava.util.logging.ConsoleHandler.level=INFO -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -source.encoding=UTF-8 -src.dir=src -test.src.dir=test diff --git a/nbproject/project.xml b/nbproject/project.xml deleted file mode 100644 index 326cafde7..000000000 --- a/nbproject/project.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - org.netbeans.modules.java.j2seproject - - - MegaBasterd - - - - - - - - - diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..00131f449 --- /dev/null +++ b/pom.xml @@ -0,0 +1,65 @@ + + + 4.0.0 + com.tonikelope + MegaBasterd + 2.91 + jar + + + org.apache.httpcomponents + httpclient + 4.5.5 + + + org.codehaus.jackson + jackson-core-asl + 1.9.13 + + + org.codehaus.jackson + jackson-mapper-asl + 1.9.13 + + + org.xerial + sqlite-jdbc + 3.21.0.1 + + + + UTF-8 + 1.8 + 1.8 + + + + + maven-assembly-plugin + + + + true + com.tonikelope.megabasterd.MainPanel + + + images/dot_com.png + + + + jar-with-dependencies + + + + + make-my-jar-with-dependencies + package + + single + + + + + + + \ No newline at end of file diff --git a/src/megabasterd/AboutDialog.form b/src/main/java/com/tonikelope/megabasterd/AboutDialog.form similarity index 94% rename from src/megabasterd/AboutDialog.form rename to src/main/java/com/tonikelope/megabasterd/AboutDialog.form index 115887c6e..3f1c431e4 100644 --- a/src/megabasterd/AboutDialog.form +++ b/src/main/java/com/tonikelope/megabasterd/AboutDialog.form @@ -39,7 +39,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -186,7 +186,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -212,10 +212,10 @@ - + - + diff --git a/src/megabasterd/AboutDialog.java b/src/main/java/com/tonikelope/megabasterd/AboutDialog.java similarity index 93% rename from src/megabasterd/AboutDialog.java rename to src/main/java/com/tonikelope/megabasterd/AboutDialog.java index d7d999b53..7c2d81d23 100644 --- a/src/megabasterd/AboutDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/AboutDialog.java @@ -1,9 +1,9 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.awt.Dialog; import javax.swing.JOptionPane; -import static megabasterd.MainPanel.*; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MainPanel.*; /** * @@ -45,7 +45,7 @@ public final class AboutDialog extends javax.swing.JDialog { author_webpage_label = new javax.swing.JLabel(); pica_roja_label = new javax.swing.JLabel(); check_version_button = new javax.swing.JButton(); - jLabel1 = new javax.swing.JLabel(); + dot_com_label = new javax.swing.JLabel(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setTitle("About"); @@ -62,7 +62,7 @@ public final class AboutDialog extends javax.swing.JDialog { } }); - made_in_spain_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/made_in_spain.jpg"))); // NOI18N + made_in_spain_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/made_in_spain.jpg"))); // NOI18N made_in_spain_label.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); made_in_spain_label.setDoubleBuffered(true); made_in_spain_label.addMouseListener(new java.awt.event.MouseAdapter() { @@ -76,7 +76,7 @@ public final class AboutDialog extends javax.swing.JDialog { subtitle_label.setText("Yet another (unofficial) cross-platform MEGA.NZ downloader/uploader/streamer suite. "); subtitle_label.setDoubleBuffered(true); - mc_logo_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/mega_crypter.png"))); // NOI18N + mc_logo_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/mega_crypter.png"))); // NOI18N mc_logo_label.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); mc_logo_label.setDoubleBuffered(true); mc_logo_label.addMouseListener(new java.awt.event.MouseAdapter() { @@ -86,7 +86,7 @@ public final class AboutDialog extends javax.swing.JDialog { }); mcdown_url_button.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N - mcdown_url_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-copy-to-clipboard-30.png"))); // NOI18N + mcdown_url_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-copy-to-clipboard-30.png"))); // NOI18N mcdown_url_button.setText("Copy MegaBasterd download URL"); mcdown_url_button.setDoubleBuffered(true); mcdown_url_button.addActionListener(new java.awt.event.ActionListener() { @@ -106,7 +106,7 @@ public final class AboutDialog extends javax.swing.JDialog { } }); - pica_roja_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/pica_roja_big.png"))); // NOI18N + pica_roja_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/pica_roja_big.png"))); // NOI18N pica_roja_label.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); pica_roja_label.setDoubleBuffered(true); pica_roja_label.addMouseListener(new java.awt.event.MouseAdapter() { @@ -116,7 +116,7 @@ public final class AboutDialog extends javax.swing.JDialog { }); check_version_button.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N - check_version_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-restart-30.png"))); // NOI18N + check_version_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-restart-30.png"))); // NOI18N check_version_button.setText("Check version"); check_version_button.setDoubleBuffered(true); check_version_button.addActionListener(new java.awt.event.ActionListener() { @@ -125,7 +125,7 @@ public final class AboutDialog extends javax.swing.JDialog { } }); - jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/dot_com2.png"))); // NOI18N + dot_com_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/dot_com2.png"))); // NOI18N javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); @@ -141,7 +141,7 @@ public final class AboutDialog extends javax.swing.JDialog { .addGroup(layout.createSequentialGroup() .addComponent(made_in_spain_label) .addGap(18, 18, 18) - .addComponent(jLabel1) + .addComponent(dot_com_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() @@ -170,7 +170,7 @@ public final class AboutDialog extends javax.swing.JDialog { .addGap(18, 18, 18) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(made_in_spain_label) - .addComponent(jLabel1) + .addComponent(dot_com_label) .addGroup(layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(pica_roja_label, javax.swing.GroupLayout.Alignment.TRAILING) @@ -251,7 +251,7 @@ public final class AboutDialog extends javax.swing.JDialog { // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JLabel author_webpage_label; private javax.swing.JButton check_version_button; - private javax.swing.JLabel jLabel1; + private javax.swing.JLabel dot_com_label; private javax.swing.JLabel made_in_spain_label; private javax.swing.JLabel mc_logo_label; private javax.swing.JButton mcdown_url_button; diff --git a/src/megabasterd/Chunk.java b/src/main/java/com/tonikelope/megabasterd/Chunk.java similarity index 98% rename from src/megabasterd/Chunk.java rename to src/main/java/com/tonikelope/megabasterd/Chunk.java index c9a442161..95e563a0a 100644 --- a/src/megabasterd/Chunk.java +++ b/src/main/java/com/tonikelope/megabasterd/Chunk.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/megabasterd/ChunkDownloader.java b/src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java similarity index 98% rename from src/megabasterd/ChunkDownloader.java rename to src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java index b914fc1ad..fc7aebd3a 100644 --- a/src/megabasterd/ChunkDownloader.java +++ b/src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.io.IOException; import java.io.InputStream; @@ -7,8 +7,8 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.logging.Level; import java.util.logging.Logger; -import static megabasterd.MainPanel.*; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MainPanel.*; import org.apache.http.HttpStatus; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; diff --git a/src/megabasterd/ChunkDownloaderMono.java b/src/main/java/com/tonikelope/megabasterd/ChunkDownloaderMono.java similarity index 97% rename from src/megabasterd/ChunkDownloaderMono.java rename to src/main/java/com/tonikelope/megabasterd/ChunkDownloaderMono.java index 01a934b45..715d4cdb7 100644 --- a/src/megabasterd/ChunkDownloaderMono.java +++ b/src/main/java/com/tonikelope/megabasterd/ChunkDownloaderMono.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.io.IOException; import java.io.InputStream; @@ -6,8 +6,8 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.logging.Level; import java.util.logging.Logger; -import static megabasterd.MainPanel.*; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MainPanel.*; import org.apache.http.HttpStatus; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; diff --git a/src/megabasterd/ChunkInvalidException.java b/src/main/java/com/tonikelope/megabasterd/ChunkInvalidException.java similarity index 83% rename from src/megabasterd/ChunkInvalidException.java rename to src/main/java/com/tonikelope/megabasterd/ChunkInvalidException.java index e57454d67..0192f641e 100644 --- a/src/megabasterd/ChunkInvalidException.java +++ b/src/main/java/com/tonikelope/megabasterd/ChunkInvalidException.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; /** * diff --git a/src/megabasterd/ChunkUploader.java b/src/main/java/com/tonikelope/megabasterd/ChunkUploader.java similarity index 98% rename from src/megabasterd/ChunkUploader.java rename to src/main/java/com/tonikelope/megabasterd/ChunkUploader.java index 98d197767..a52ec4b07 100644 --- a/src/megabasterd/ChunkUploader.java +++ b/src/main/java/com/tonikelope/megabasterd/ChunkUploader.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -21,14 +21,14 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.crypto.CipherInputStream; import javax.crypto.NoSuchPaddingException; -import static megabasterd.MainPanel.*; -import static megabasterd.MiscTools.*; -import static megabasterd.CryptTools.*; import org.apache.http.HttpStatus; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.InputStreamEntity; import org.apache.http.impl.client.CloseableHttpClient; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.CryptTools.*; +import static com.tonikelope.megabasterd.MainPanel.*; /** * diff --git a/src/megabasterd/ChunkUploaderMono.java b/src/main/java/com/tonikelope/megabasterd/ChunkUploaderMono.java similarity index 98% rename from src/megabasterd/ChunkUploaderMono.java rename to src/main/java/com/tonikelope/megabasterd/ChunkUploaderMono.java index f3767655c..66a21e738 100644 --- a/src/megabasterd/ChunkUploaderMono.java +++ b/src/main/java/com/tonikelope/megabasterd/ChunkUploaderMono.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -20,9 +20,9 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.crypto.CipherInputStream; import javax.crypto.NoSuchPaddingException; -import static megabasterd.MainPanel.*; -import static megabasterd.MiscTools.*; -import static megabasterd.CryptTools.*; +import static com.tonikelope.megabasterd.MainPanel.*; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.CryptTools.*; import org.apache.http.HttpStatus; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; diff --git a/src/megabasterd/ChunkWriter.java b/src/main/java/com/tonikelope/megabasterd/ChunkWriter.java similarity index 98% rename from src/megabasterd/ChunkWriter.java rename to src/main/java/com/tonikelope/megabasterd/ChunkWriter.java index 86a39a604..03174fdf0 100644 --- a/src/megabasterd/ChunkWriter.java +++ b/src/main/java/com/tonikelope/megabasterd/ChunkWriter.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.io.IOException; import java.security.InvalidAlgorithmParameterException; @@ -10,7 +10,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.crypto.CipherInputStream; import javax.crypto.NoSuchPaddingException; -import static megabasterd.CryptTools.*; +import static com.tonikelope.megabasterd.CryptTools.*; /** * diff --git a/src/megabasterd/ClipboardChangeObservable.java b/src/main/java/com/tonikelope/megabasterd/ClipboardChangeObservable.java similarity index 89% rename from src/megabasterd/ClipboardChangeObservable.java rename to src/main/java/com/tonikelope/megabasterd/ClipboardChangeObservable.java index 83f031b5b..e851c3e1a 100644 --- a/src/megabasterd/ClipboardChangeObservable.java +++ b/src/main/java/com/tonikelope/megabasterd/ClipboardChangeObservable.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.awt.datatransfer.Transferable; diff --git a/src/megabasterd/ClipboardChangeObserver.java b/src/main/java/com/tonikelope/megabasterd/ClipboardChangeObserver.java similarity index 76% rename from src/megabasterd/ClipboardChangeObserver.java rename to src/main/java/com/tonikelope/megabasterd/ClipboardChangeObserver.java index 6f6b14945..2b64eb873 100644 --- a/src/megabasterd/ClipboardChangeObserver.java +++ b/src/main/java/com/tonikelope/megabasterd/ClipboardChangeObserver.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; /** * diff --git a/src/megabasterd/ClipboardSpy.java b/src/main/java/com/tonikelope/megabasterd/ClipboardSpy.java similarity index 99% rename from src/megabasterd/ClipboardSpy.java rename to src/main/java/com/tonikelope/megabasterd/ClipboardSpy.java index fc331e6a0..b7d6afba8 100644 --- a/src/megabasterd/ClipboardSpy.java +++ b/src/main/java/com/tonikelope/megabasterd/ClipboardSpy.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import static java.awt.Toolkit.getDefaultToolkit; import java.awt.datatransfer.Clipboard; diff --git a/src/megabasterd/ContentType.java b/src/main/java/com/tonikelope/megabasterd/ContentType.java similarity index 98% rename from src/megabasterd/ContentType.java rename to src/main/java/com/tonikelope/megabasterd/ContentType.java index 7fa113b45..0aa8f9b05 100644 --- a/src/megabasterd/ContentType.java +++ b/src/main/java/com/tonikelope/megabasterd/ContentType.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.util.HashMap; diff --git a/src/megabasterd/ContextMenuMouseListener.java b/src/main/java/com/tonikelope/megabasterd/ContextMenuMouseListener.java similarity index 99% rename from src/megabasterd/ContextMenuMouseListener.java rename to src/main/java/com/tonikelope/megabasterd/ContextMenuMouseListener.java index c2920cb5e..ed1b75c12 100644 --- a/src/megabasterd/ContextMenuMouseListener.java +++ b/src/main/java/com/tonikelope/megabasterd/ContextMenuMouseListener.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.awt.Toolkit; import java.awt.datatransfer.DataFlavor; diff --git a/src/megabasterd/CryptTools.java b/src/main/java/com/tonikelope/megabasterd/CryptTools.java similarity index 99% rename from src/megabasterd/CryptTools.java rename to src/main/java/com/tonikelope/megabasterd/CryptTools.java index 3dabb0701..0b2fed37c 100644 --- a/src/megabasterd/CryptTools.java +++ b/src/main/java/com/tonikelope/megabasterd/CryptTools.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -30,7 +30,7 @@ import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.PBEKeySpec; import javax.crypto.spec.SecretKeySpec; import javax.swing.JOptionPane; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.CloseableHttpResponse; diff --git a/src/megabasterd/DBTools.java b/src/main/java/com/tonikelope/megabasterd/DBTools.java similarity index 99% rename from src/megabasterd/DBTools.java rename to src/main/java/com/tonikelope/megabasterd/DBTools.java index 76253780a..852a32602 100644 --- a/src/megabasterd/DBTools.java +++ b/src/main/java/com/tonikelope/megabasterd/DBTools.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/megabasterd/Download.java b/src/main/java/com/tonikelope/megabasterd/Download.java similarity index 99% rename from src/megabasterd/Download.java rename to src/main/java/com/tonikelope/megabasterd/Download.java index 3e6c8ec53..450cfc863 100644 --- a/src/megabasterd/Download.java +++ b/src/main/java/com/tonikelope/megabasterd/Download.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.io.BufferedOutputStream; import java.io.File; @@ -31,11 +31,10 @@ import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; import javax.swing.JComponent; -import static megabasterd.MiscTools.*; -import static megabasterd.CryptTools.*; -import static megabasterd.DBTools.*; -import static megabasterd.MainPanel.*; -import static megabasterd.Transference.*; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.CryptTools.*; +import static com.tonikelope.megabasterd.DBTools.*; +import static com.tonikelope.megabasterd.MainPanel.*; /** * @@ -792,7 +791,7 @@ public final class Download implements Transference, Runnable, SecureSingleThrea } else { - getView().getClose_button().setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-ok-30.png"))); + getView().getClose_button().setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-ok-30.png"))); } } }); diff --git a/src/megabasterd/DownloadManager.java b/src/main/java/com/tonikelope/megabasterd/DownloadManager.java similarity index 95% rename from src/megabasterd/DownloadManager.java rename to src/main/java/com/tonikelope/megabasterd/DownloadManager.java index b914004c4..be468e425 100644 --- a/src/megabasterd/DownloadManager.java +++ b/src/main/java/com/tonikelope/megabasterd/DownloadManager.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.awt.Component; import java.sql.SQLException; @@ -6,9 +6,9 @@ import java.util.ArrayList; import java.util.logging.Level; import static java.util.logging.Level.SEVERE; import java.util.logging.Logger; -import static megabasterd.DBTools.*; -import static megabasterd.MainPanel.*; -import static megabasterd.MiscTools.swingInvoke; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.DBTools.*; +import static com.tonikelope.megabasterd.MainPanel.*; /** * diff --git a/src/megabasterd/DownloadView.form b/src/main/java/com/tonikelope/megabasterd/DownloadView.form similarity index 98% rename from src/megabasterd/DownloadView.form rename to src/main/java/com/tonikelope/megabasterd/DownloadView.form index 4356b5827..580856ce8 100644 --- a/src/megabasterd/DownloadView.form +++ b/src/main/java/com/tonikelope/megabasterd/DownloadView.form @@ -225,7 +225,7 @@ - + @@ -240,7 +240,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -291,7 +291,7 @@ - + diff --git a/src/megabasterd/DownloadView.java b/src/main/java/com/tonikelope/megabasterd/DownloadView.java similarity index 98% rename from src/megabasterd/DownloadView.java rename to src/main/java/com/tonikelope/megabasterd/DownloadView.java index 9c0e04060..e6cc9fb74 100644 --- a/src/megabasterd/DownloadView.java +++ b/src/main/java/com/tonikelope/megabasterd/DownloadView.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.awt.Color; import java.awt.Desktop; @@ -14,8 +14,8 @@ import javax.swing.JOptionPane; import javax.swing.JProgressBar; import javax.swing.JSpinner; import javax.swing.SpinnerNumberModel; -import static megabasterd.MainPanel.*; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MainPanel.*; /** * @@ -211,7 +211,7 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen file_name_label.setDoubleBuffered(true); close_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N - close_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-cancel-30.png"))); // NOI18N + close_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-cancel-30.png"))); // NOI18N close_button.setText("Close"); close_button.setDoubleBuffered(true); close_button.addActionListener(new java.awt.event.ActionListener() { @@ -221,7 +221,7 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen }); copy_link_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N - copy_link_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-copy-to-clipboard-30.png"))); // NOI18N + copy_link_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-copy-to-clipboard-30.png"))); // NOI18N copy_link_button.setText("Copy link"); copy_link_button.setDoubleBuffered(true); copy_link_button.addActionListener(new java.awt.event.ActionListener() { @@ -231,7 +231,7 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen }); restart_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N - restart_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-restart-30.png"))); // NOI18N + restart_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-restart-30.png"))); // NOI18N restart_button.setText("Restart"); restart_button.setDoubleBuffered(true); restart_button.addActionListener(new java.awt.event.ActionListener() { @@ -250,7 +250,7 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen slot_status_label.setDoubleBuffered(true); open_folder_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N - open_folder_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-folder-30.png"))); // NOI18N + open_folder_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-folder-30.png"))); // NOI18N open_folder_button.setText("Open folder"); open_folder_button.setDoubleBuffered(true); open_folder_button.addActionListener(new java.awt.event.ActionListener() { diff --git a/src/megabasterd/FileGrabberDialog.form b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form similarity index 97% rename from src/megabasterd/FileGrabberDialog.form rename to src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form index 2f58b955e..0e8ddcaa3 100644 --- a/src/megabasterd/FileGrabberDialog.form +++ b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form @@ -86,7 +86,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -252,7 +252,7 @@ - + @@ -309,7 +309,7 @@ - + @@ -325,7 +325,7 @@ - + diff --git a/src/megabasterd/FileGrabberDialog.java b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java similarity index 98% rename from src/megabasterd/FileGrabberDialog.java rename to src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java index 92db3b342..59daab4e3 100644 --- a/src/megabasterd/FileGrabberDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.awt.Color; import java.awt.Dialog; @@ -12,8 +12,8 @@ import javax.swing.JTextField; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeNode; -import static megabasterd.MainPanel.*; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MainPanel.*; /** * @@ -146,7 +146,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog { ); jPanel1Layout.setVerticalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 227, Short.MAX_VALUE) + .addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 224, Short.MAX_VALUE) ); jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("Upload info")); @@ -179,7 +179,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog { used_space_label.setDoubleBuffered(true); add_folder_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N - add_folder_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-add-folder-30.png"))); // NOI18N + add_folder_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-add-folder-30.png"))); // NOI18N add_folder_button.setText("Add folder"); add_folder_button.setDoubleBuffered(true); add_folder_button.setEnabled(false); @@ -190,7 +190,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog { }); add_files_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N - add_files_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-add-file-30.png"))); // NOI18N + add_files_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-add-file-30.png"))); // NOI18N add_files_button.setText("Add files"); add_files_button.setDoubleBuffered(true); add_files_button.setEnabled(false); @@ -263,7 +263,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog { warning_label.setEnabled(false); skip_rest_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N - skip_rest_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-trash-can-30.png"))); // NOI18N + skip_rest_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-trash-can-30.png"))); // NOI18N skip_rest_button.setText("REMOVE ALL EXCEPT THIS"); skip_rest_button.setDoubleBuffered(true); skip_rest_button.setEnabled(false); @@ -274,7 +274,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog { }); skip_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N - skip_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-trash-can-30.png"))); // NOI18N + skip_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-trash-can-30.png"))); // NOI18N skip_button.setText("REMOVE THIS"); skip_button.setDoubleBuffered(true); skip_button.setEnabled(false); diff --git a/src/megabasterd/FolderLinkDialog.form b/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.form similarity index 97% rename from src/megabasterd/FolderLinkDialog.form rename to src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.form index fb5333ffc..928891a95 100644 --- a/src/megabasterd/FolderLinkDialog.form +++ b/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.form @@ -72,7 +72,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -195,7 +195,7 @@ - + diff --git a/src/megabasterd/FolderLinkDialog.java b/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.java similarity index 97% rename from src/megabasterd/FolderLinkDialog.java rename to src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.java index e9447442c..a76ed421d 100644 --- a/src/megabasterd/FolderLinkDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.util.ArrayList; import java.util.Collections; @@ -11,8 +11,8 @@ import java.util.logging.Logger; import javax.swing.JComponent; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeNode; -import static megabasterd.MainPanel.*; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MainPanel.*; /** * @@ -107,7 +107,7 @@ public final class FolderLinkDialog extends javax.swing.JDialog { file_tree_scrollpane.setViewportView(file_tree); skip_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N - skip_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-trash-can-30.png"))); // NOI18N + skip_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-trash-can-30.png"))); // NOI18N skip_button.setText("REMOVE THIS"); skip_button.setDoubleBuffered(true); skip_button.setEnabled(false); @@ -118,7 +118,7 @@ public final class FolderLinkDialog extends javax.swing.JDialog { }); link_detected_label.setFont(new java.awt.Font("Dialog", 1, 24)); // NOI18N - link_detected_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-folder-30.png"))); // NOI18N + link_detected_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-folder-30.png"))); // NOI18N link_detected_label.setText("Folder link detected!"); link_detected_label.setDoubleBuffered(true); @@ -144,7 +144,7 @@ public final class FolderLinkDialog extends javax.swing.JDialog { warning_label.setEnabled(false); skip_rest_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N - skip_rest_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-trash-can-30.png"))); // NOI18N + skip_rest_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-trash-can-30.png"))); // NOI18N skip_rest_button.setText("REMOVE ALL EXCEPT THIS"); skip_rest_button.setDoubleBuffered(true); skip_rest_button.setEnabled(false); @@ -155,7 +155,7 @@ public final class FolderLinkDialog extends javax.swing.JDialog { }); restore_button.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N - restore_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-undelete-30.png"))); // NOI18N + restore_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-undelete-30.png"))); // NOI18N restore_button.setText("Restore folder data"); restore_button.setDoubleBuffered(true); restore_button.addActionListener(new java.awt.event.ActionListener() { @@ -212,7 +212,7 @@ public final class FolderLinkDialog extends javax.swing.JDialog { .addComponent(folder_link_label) .addComponent(restore_button)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 331, Short.MAX_VALUE) + .addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 317, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(total_space_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) diff --git a/src/megabasterd/GetMasterPasswordDialog.form b/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.form similarity index 94% rename from src/megabasterd/GetMasterPasswordDialog.form rename to src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.form index c7c423aa7..99bfe4cf4 100644 --- a/src/megabasterd/GetMasterPasswordDialog.form +++ b/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.form @@ -98,6 +98,9 @@ + + + @@ -110,6 +113,9 @@ + + + @@ -120,7 +126,7 @@ - + diff --git a/src/megabasterd/GetMasterPasswordDialog.java b/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.java similarity index 95% rename from src/megabasterd/GetMasterPasswordDialog.java rename to src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.java index 3a359c705..d093c2455 100644 --- a/src/megabasterd/GetMasterPasswordDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.awt.Dialog; import java.awt.HeadlessException; @@ -11,8 +11,8 @@ import java.util.logging.Logger; import javax.swing.JCheckBox; import javax.swing.JOptionPane; import javax.swing.JPasswordField; -import static megabasterd.MainPanel.*; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MainPanel.*; /** * @@ -106,6 +106,7 @@ public class GetMasterPasswordDialog extends javax.swing.JDialog { }); cancel_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + cancel_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-cancel-30.png"))); // NOI18N cancel_button.setText("CANCEL"); cancel_button.setDoubleBuffered(true); cancel_button.addActionListener(new java.awt.event.ActionListener() { @@ -115,6 +116,7 @@ public class GetMasterPasswordDialog extends javax.swing.JDialog { }); ok_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + ok_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-ok-30.png"))); // NOI18N ok_button.setText("OK"); ok_button.setDoubleBuffered(true); ok_button.addActionListener(new java.awt.event.ActionListener() { @@ -123,7 +125,7 @@ public class GetMasterPasswordDialog extends javax.swing.JDialog { } }); - lock_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/lock_medium.png"))); // NOI18N + lock_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/lock_medium.png"))); // NOI18N lock_label.setDoubleBuffered(true); please_label.setFont(new java.awt.Font("Dialog", 1, 24)); // NOI18N diff --git a/src/megabasterd/GlobalSpeedMeter.java b/src/main/java/com/tonikelope/megabasterd/GlobalSpeedMeter.java similarity index 98% rename from src/megabasterd/GlobalSpeedMeter.java rename to src/main/java/com/tonikelope/megabasterd/GlobalSpeedMeter.java index 19130d91e..deff02061 100644 --- a/src/megabasterd/GlobalSpeedMeter.java +++ b/src/main/java/com/tonikelope/megabasterd/GlobalSpeedMeter.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.util.HashMap; import java.util.Map; @@ -7,7 +7,7 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.JLabel; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; /** * diff --git a/src/megabasterd/KissVideoStreamServer.java b/src/main/java/com/tonikelope/megabasterd/KissVideoStreamServer.java similarity index 99% rename from src/megabasterd/KissVideoStreamServer.java rename to src/main/java/com/tonikelope/megabasterd/KissVideoStreamServer.java index f7e01957d..883228a17 100644 --- a/src/megabasterd/KissVideoStreamServer.java +++ b/src/main/java/com/tonikelope/megabasterd/KissVideoStreamServer.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; @@ -23,8 +23,8 @@ import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.crypto.CipherInputStream; -import static megabasterd.MainPanel.*; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MainPanel.*; +import static com.tonikelope.megabasterd.MiscTools.*; import org.apache.http.HttpStatus; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; diff --git a/src/megabasterd/LinkGrabberDialog.form b/src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.form similarity index 97% rename from src/megabasterd/LinkGrabberDialog.form rename to src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.form index ab5760070..c1a9aa43f 100644 --- a/src/megabasterd/LinkGrabberDialog.form +++ b/src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.form @@ -33,7 +33,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -167,7 +167,7 @@ - + diff --git a/src/megabasterd/LinkGrabberDialog.java b/src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.java similarity index 97% rename from src/megabasterd/LinkGrabberDialog.java rename to src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.java index 18ec91425..8cc347687 100644 --- a/src/megabasterd/LinkGrabberDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.io.ByteArrayOutputStream; import java.io.File; @@ -14,8 +14,8 @@ import javax.swing.JComboBox; import javax.swing.JFileChooser; import javax.swing.JTextArea; import javax.swing.filechooser.FileNameExtensionFilter; -import static megabasterd.MainPanel.*; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MainPanel.*; /** * @@ -144,7 +144,7 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip links_label.setDoubleBuffered(true); change_dir_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N - change_dir_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-folder-30.png"))); // NOI18N + change_dir_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-folder-30.png"))); // NOI18N change_dir_button.setText("Change it"); change_dir_button.setDoubleBuffered(true); change_dir_button.addActionListener(new java.awt.event.ActionListener() { @@ -161,7 +161,7 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip download_dir_label.setText("default dir"); dlc_button.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N - dlc_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-add-file-30.png"))); // NOI18N + dlc_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-add-file-30.png"))); // NOI18N dlc_button.setText("Load DLC container"); dlc_button.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -192,7 +192,7 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(down_dir_to_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(download_dir_label, javax.swing.GroupLayout.DEFAULT_SIZE, 329, Short.MAX_VALUE) + .addComponent(download_dir_label, javax.swing.GroupLayout.DEFAULT_SIZE, 295, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(dance_button)) .addGroup(layout.createSequentialGroup() @@ -213,7 +213,7 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip .addComponent(links_label) .addComponent(dlc_button)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(links_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 330, Short.MAX_VALUE) + .addComponent(links_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 314, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(use_mega_account_down_label) diff --git a/src/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java similarity index 91% rename from src/megabasterd/MainPanel.java rename to src/main/java/com/tonikelope/megabasterd/MainPanel.java index e20359e88..5c797924a 100644 --- a/src/megabasterd/MainPanel.java +++ b/src/main/java/com/tonikelope/megabasterd/MainPanel.java @@ -1,19 +1,9 @@ -package megabasterd; +package com.tonikelope.megabasterd; -import java.awt.AWTException; import java.awt.Color; import static java.awt.EventQueue.invokeLater; import java.awt.Font; import static java.awt.Frame.NORMAL; -import java.awt.MenuItem; -import java.awt.PopupMenu; -import static java.awt.SystemTray.getSystemTray; -import static java.awt.Toolkit.getDefaultToolkit; -import java.awt.TrayIcon; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.WindowEvent; -import static java.awt.event.WindowEvent.WINDOW_CLOSING; import java.io.IOException; import static java.lang.Integer.parseInt; import static java.lang.System.exit; @@ -36,9 +26,19 @@ import static javax.swing.JOptionPane.WARNING_MESSAGE; import static javax.swing.JOptionPane.YES_NO_CANCEL_OPTION; import static javax.swing.JOptionPane.showOptionDialog; import javax.swing.UIManager; -import static megabasterd.DBTools.*; -import static megabasterd.MiscTools.*; -import static megabasterd.Transference.*; +import static com.tonikelope.megabasterd.DBTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.Transference.*; +import java.awt.AWTException; +import java.awt.MenuItem; +import java.awt.PopupMenu; +import static java.awt.SystemTray.getSystemTray; +import static java.awt.Toolkit.getDefaultToolkit; +import java.awt.TrayIcon; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowEvent; +import static java.awt.event.WindowEvent.WINDOW_CLOSING; import org.apache.http.auth.Credentials; import org.apache.http.auth.UsernamePasswordCredentials; @@ -48,16 +48,16 @@ import org.apache.http.auth.UsernamePasswordCredentials; */ public final class MainPanel { - public static final String VERSION = "2.90"; + public static final String VERSION = "2.91"; public static final int THROTTLE_SLICE_SIZE = 16 * 1024; public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024; public static final int STREAMER_PORT = 1337; public static final int WATCHDOG_PORT = 1338; public static final int DEFAULT_MEGA_PROXY_PORT = 9999; - public static final Font DEFAULT_FONT = createAndRegisterFont("Itim-Regular.ttf"); + public static final Font DEFAULT_FONT = createAndRegisterFont("/fonts/Itim-Regular.ttf"); public static final float ZOOM_FACTOR = 1.0f; public static final String DEFAULT_USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64; rv:57.0) Gecko/20100101 Firefox/57.0"; - public static final String ICON_FILE = "mbasterd_med.png"; + public static final String ICON_FILE = "/images/mbasterd_32.png"; public static final ExecutorService THREAD_POOL = newCachedThreadPool(); private static String _proxy_host; private static int _proxy_port; @@ -159,11 +159,9 @@ public final class MainPanel { } try { - trayIcon(); - } catch (AWTException ex) { - Logger.getLogger(MainPanel.class.getName()).log(SEVERE, null, ex); + Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, null, ex); } THREAD_POOL.execute((_download_manager = new DownloadManager(this))); @@ -839,94 +837,91 @@ public final class MainPanel { } - public boolean trayIcon() throws AWTException { + public void trayIcon() throws AWTException { - if (!java.awt.SystemTray.isSupported()) { + if (java.awt.SystemTray.isSupported()) { - return false; - } + PopupMenu menu = new PopupMenu(); - PopupMenu menu = new PopupMenu(); + MenuItem messageItem = new MenuItem("Restore window"); - MenuItem messageItem = new MenuItem("Restore window"); + messageItem.addActionListener(new ActionListener() { - messageItem.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { - @Override - public void actionPerformed(ActionEvent e) { + swingInvoke( + new Runnable() { + @Override + public void run() { - swingInvoke( - new Runnable() { - @Override - public void run() { - - getView().setExtendedState(NORMAL); - - getView().setVisible(true); - - getView().revalidate(); - - getView().repaint(); - } - }); - - } - }); - - menu.add(messageItem); - - MenuItem closeItem = new MenuItem("EXIT"); - - closeItem.addActionListener(new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - - byebye(); - - } - - }); - - menu.add(closeItem); - - ActionListener actionListener = new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - - swingInvoke( - new Runnable() { - @Override - public void run() { - - if (!getView().isVisible()) { getView().setExtendedState(NORMAL); + getView().setVisible(true); + getView().revalidate(); + getView().repaint(); - - } else { - - getView().dispatchEvent(new WindowEvent(getView(), WINDOW_CLOSING)); } - } - }); + }); - } - }; + } + }); - _trayicon = new TrayIcon(getDefaultToolkit().getImage(getClass().getResource(ICON_FILE)), "MegaBasterd", menu); + menu.add(messageItem); - _trayicon.setToolTip("MegaBasterd " + VERSION); + MenuItem closeItem = new MenuItem("EXIT"); - _trayicon.setImageAutoSize(true); + closeItem.addActionListener(new ActionListener() { - _trayicon.addActionListener(actionListener); + @Override + public void actionPerformed(ActionEvent e) { - getSystemTray().add(_trayicon); + byebye(); - return true; + } + + }); + + menu.add(closeItem); + + ActionListener actionListener = new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + + swingInvoke( + new Runnable() { + @Override + public void run() { + + if (!getView().isVisible()) { + getView().setExtendedState(NORMAL); + getView().setVisible(true); + getView().revalidate(); + getView().repaint(); + + } else { + + getView().dispatchEvent(new WindowEvent(getView(), WINDOW_CLOSING)); + } + } + }); + + } + }; + + _trayicon = new TrayIcon(getDefaultToolkit().getImage(getClass().getResource(ICON_FILE)), "MegaBasterd", menu); + + _trayicon.setToolTip("MegaBasterd " + VERSION); + + _trayicon.setImageAutoSize(true); + + _trayicon.addActionListener(actionListener); + + getSystemTray().add(_trayicon); + + } } diff --git a/src/megabasterd/MainPanelView.form b/src/main/java/com/tonikelope/megabasterd/MainPanelView.form similarity index 96% rename from src/megabasterd/MainPanelView.form rename to src/main/java/com/tonikelope/megabasterd/MainPanelView.form index cd3c8ebf0..ebc295951 100644 --- a/src/megabasterd/MainPanelView.form +++ b/src/main/java/com/tonikelope/megabasterd/MainPanelView.form @@ -19,7 +19,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -233,7 +233,7 @@ - + @@ -286,7 +286,7 @@ - + @@ -319,7 +319,7 @@ - + @@ -358,7 +358,7 @@ - + @@ -417,7 +417,7 @@ - + @@ -450,7 +450,7 @@ - + @@ -488,7 +488,7 @@ - + diff --git a/src/megabasterd/MainPanelView.java b/src/main/java/com/tonikelope/megabasterd/MainPanelView.java similarity index 97% rename from src/megabasterd/MainPanelView.java rename to src/main/java/com/tonikelope/megabasterd/MainPanelView.java index be8ce7a4e..74878a560 100644 --- a/src/megabasterd/MainPanelView.java +++ b/src/main/java/com/tonikelope/megabasterd/MainPanelView.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.awt.Color; import java.awt.event.WindowEvent; @@ -26,12 +26,12 @@ import javax.swing.JOptionPane; import static javax.swing.JOptionPane.QUESTION_MESSAGE; import static javax.swing.JOptionPane.YES_NO_CANCEL_OPTION; import static javax.swing.JOptionPane.showOptionDialog; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.CryptTools.*; +import static com.tonikelope.megabasterd.DBTools.*; +import static com.tonikelope.megabasterd.MainPanel.*; import javax.swing.JPanel; import javax.swing.JTabbedPane; -import static megabasterd.CryptTools.*; -import static megabasterd.DBTools.*; -import static megabasterd.MainPanel.*; -import static megabasterd.MiscTools.*; /** * @@ -238,7 +238,7 @@ public final class MainPanelView extends javax.swing.JFrame { setTitle("MegaBasterd " + VERSION); setIconImage(new ImageIcon(getClass().getResource(ICON_FILE)).getImage()); - logo_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/mbasterd_logo_nuevo.png"))); // NOI18N + logo_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/mbasterd_logo_nuevo.png"))); // NOI18N logo_label.setDoubleBuffered(true); kiss_server_status.setFont(new java.awt.Font("Dialog", 2, 14)); // NOI18N @@ -264,7 +264,7 @@ public final class MainPanelView extends javax.swing.JFrame { status_down_label.setDoubleBuffered(true); close_all_finished_down_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N - close_all_finished_down_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-ok-30.png"))); // NOI18N + close_all_finished_down_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-ok-30.png"))); // NOI18N close_all_finished_down_button.setText("Close all OK finished"); close_all_finished_down_button.setDoubleBuffered(true); close_all_finished_down_button.addActionListener(new java.awt.event.ActionListener() { @@ -315,7 +315,7 @@ public final class MainPanelView extends javax.swing.JFrame { .addComponent(close_all_finished_down_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(status_down_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane_down, javax.swing.GroupLayout.DEFAULT_SIZE, 337, Short.MAX_VALUE) + .addComponent(jScrollPane_down, javax.swing.GroupLayout.DEFAULT_SIZE, 321, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(down_remtime_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -324,7 +324,7 @@ public final class MainPanelView extends javax.swing.JFrame { .addComponent(pause_all_down_button))) ); - jTabbedPane1.addTab("Downloads", new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-download-from-ftp-30.png")), downloads_panel); // NOI18N + jTabbedPane1.addTab("Downloads", new javax.swing.ImageIcon(getClass().getResource("/images/icons8-download-from-ftp-30.png")), downloads_panel); // NOI18N global_speed_up_label.setFont(new java.awt.Font("Dialog", 1, 54)); // NOI18N global_speed_up_label.setText("Speed"); @@ -334,7 +334,7 @@ public final class MainPanelView extends javax.swing.JFrame { status_up_label.setForeground(new java.awt.Color(102, 102, 102)); close_all_finished_up_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N - close_all_finished_up_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-ok-30.png"))); // NOI18N + close_all_finished_up_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-ok-30.png"))); // NOI18N close_all_finished_up_button.setText("Close all OK finished"); close_all_finished_up_button.setDoubleBuffered(true); close_all_finished_up_button.addActionListener(new java.awt.event.ActionListener() { @@ -385,7 +385,7 @@ public final class MainPanelView extends javax.swing.JFrame { .addComponent(close_all_finished_up_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(status_up_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane_up, javax.swing.GroupLayout.DEFAULT_SIZE, 337, Short.MAX_VALUE) + .addComponent(jScrollPane_up, javax.swing.GroupLayout.DEFAULT_SIZE, 321, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(up_remtime_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -394,14 +394,14 @@ public final class MainPanelView extends javax.swing.JFrame { .addComponent(pause_all_up_button))) ); - jTabbedPane1.addTab("Uploads", new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-upload-to-ftp-30.png")), uploads_panel); // NOI18N + jTabbedPane1.addTab("Uploads", new javax.swing.ImageIcon(getClass().getResource("/images/icons8-upload-to-ftp-30.png")), uploads_panel); // NOI18N file_menu.setText("File"); file_menu.setDoubleBuffered(true); file_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N new_download_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N - new_download_menu.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-download-from-ftp-30.png"))); // NOI18N + new_download_menu.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-download-from-ftp-30.png"))); // NOI18N new_download_menu.setText("New download"); new_download_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -411,7 +411,7 @@ public final class MainPanelView extends javax.swing.JFrame { file_menu.add(new_download_menu); new_upload_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N - new_upload_menu.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-upload-to-ftp-30.png"))); // NOI18N + new_upload_menu.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-upload-to-ftp-30.png"))); // NOI18N new_upload_menu.setText("New upload"); new_upload_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -421,7 +421,7 @@ public final class MainPanelView extends javax.swing.JFrame { file_menu.add(new_upload_menu); new_stream_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N - new_stream_menu.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-video-playlist-30.png"))); // NOI18N + new_stream_menu.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-video-playlist-30.png"))); // NOI18N new_stream_menu.setText("New stream"); new_stream_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -432,7 +432,7 @@ public final class MainPanelView extends javax.swing.JFrame { file_menu.add(jSeparator4); clean_all_down_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N - clean_all_down_menu.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-trash-can-30.png"))); // NOI18N + clean_all_down_menu.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-trash-can-30.png"))); // NOI18N clean_all_down_menu.setText("Remove all no running downloads"); clean_all_down_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -442,7 +442,7 @@ public final class MainPanelView extends javax.swing.JFrame { file_menu.add(clean_all_down_menu); clean_all_up_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N - clean_all_up_menu.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-trash-can-30.png"))); // NOI18N + clean_all_up_menu.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-trash-can-30.png"))); // NOI18N clean_all_up_menu.setText("Remove all no running uploads"); clean_all_up_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -462,7 +462,7 @@ public final class MainPanelView extends javax.swing.JFrame { file_menu.add(hide_tray_menu); exit_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N - exit_menu.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-shutdown-30.png"))); // NOI18N + exit_menu.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-shutdown-30.png"))); // NOI18N exit_menu.setText("Exit"); exit_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -478,7 +478,7 @@ public final class MainPanelView extends javax.swing.JFrame { edit_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N settings_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N - settings_menu.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-services-30.png"))); // NOI18N + settings_menu.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-services-30.png"))); // NOI18N settings_menu.setText("Settings"); settings_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { diff --git a/src/megabasterd/MegaAPI.java b/src/main/java/com/tonikelope/megabasterd/MegaAPI.java similarity index 99% rename from src/megabasterd/MegaAPI.java rename to src/main/java/com/tonikelope/megabasterd/MegaAPI.java index a3211a1f6..b9f606c12 100644 --- a/src/megabasterd/MegaAPI.java +++ b/src/main/java/com/tonikelope/megabasterd/MegaAPI.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.io.ByteArrayOutputStream; import java.io.File; @@ -15,8 +15,8 @@ import java.util.Random; import java.util.logging.Level; import java.util.logging.Logger; import javax.crypto.Cipher; -import static megabasterd.MiscTools.*; -import static megabasterd.CryptTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.CryptTools.*; import org.apache.http.HttpStatus; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; diff --git a/src/megabasterd/MegaAPIException.java b/src/main/java/com/tonikelope/megabasterd/MegaAPIException.java similarity index 82% rename from src/megabasterd/MegaAPIException.java rename to src/main/java/com/tonikelope/megabasterd/MegaAPIException.java index a41626418..6ee954bd1 100644 --- a/src/megabasterd/MegaAPIException.java +++ b/src/main/java/com/tonikelope/megabasterd/MegaAPIException.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; /** * diff --git a/src/megabasterd/MegaCrypterAPI.java b/src/main/java/com/tonikelope/megabasterd/MegaCrypterAPI.java similarity index 98% rename from src/megabasterd/MegaCrypterAPI.java rename to src/main/java/com/tonikelope/megabasterd/MegaCrypterAPI.java index 48eaf8c9f..0f8553f3b 100644 --- a/src/megabasterd/MegaCrypterAPI.java +++ b/src/main/java/com/tonikelope/megabasterd/MegaCrypterAPI.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -15,8 +15,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.crypto.Cipher; import javax.swing.JOptionPane; -import static megabasterd.MiscTools.*; -import static megabasterd.CryptTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.CryptTools.*; import org.apache.http.HttpStatus; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; diff --git a/src/megabasterd/MegaCrypterAPIException.java b/src/main/java/com/tonikelope/megabasterd/MegaCrypterAPIException.java similarity index 83% rename from src/megabasterd/MegaCrypterAPIException.java rename to src/main/java/com/tonikelope/megabasterd/MegaCrypterAPIException.java index 64ac64a93..a8182f078 100644 --- a/src/megabasterd/MegaCrypterAPIException.java +++ b/src/main/java/com/tonikelope/megabasterd/MegaCrypterAPIException.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; /** * diff --git a/src/megabasterd/MegaDirNode.java b/src/main/java/com/tonikelope/megabasterd/MegaDirNode.java similarity index 92% rename from src/megabasterd/MegaDirNode.java rename to src/main/java/com/tonikelope/megabasterd/MegaDirNode.java index b73f33ea4..bc4ddb035 100644 --- a/src/megabasterd/MegaDirNode.java +++ b/src/main/java/com/tonikelope/megabasterd/MegaDirNode.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.util.HashMap; diff --git a/src/megabasterd/MegaMutableTreeNode.java b/src/main/java/com/tonikelope/megabasterd/MegaMutableTreeNode.java similarity index 89% rename from src/megabasterd/MegaMutableTreeNode.java rename to src/main/java/com/tonikelope/megabasterd/MegaMutableTreeNode.java index 335b11142..2933a74ab 100644 --- a/src/megabasterd/MegaMutableTreeNode.java +++ b/src/main/java/com/tonikelope/megabasterd/MegaMutableTreeNode.java @@ -1,8 +1,8 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.util.HashMap; import javax.swing.tree.DefaultMutableTreeNode; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; /** * diff --git a/src/megabasterd/MegaProxyServer.java b/src/main/java/com/tonikelope/megabasterd/MegaProxyServer.java similarity index 99% rename from src/megabasterd/MegaProxyServer.java rename to src/main/java/com/tonikelope/megabasterd/MegaProxyServer.java index ef7b2d199..6bdc7d07e 100644 --- a/src/megabasterd/MegaProxyServer.java +++ b/src/main/java/com/tonikelope/megabasterd/MegaProxyServer.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.io.*; import java.net.ServerSocket; @@ -7,7 +7,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; /** * diff --git a/src/megabasterd/MiscTools.java b/src/main/java/com/tonikelope/megabasterd/MiscTools.java similarity index 99% rename from src/megabasterd/MiscTools.java rename to src/main/java/com/tonikelope/megabasterd/MiscTools.java index 1ee330853..3ad090ac9 100644 --- a/src/megabasterd/MiscTools.java +++ b/src/main/java/com/tonikelope/megabasterd/MiscTools.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.awt.Component; import java.awt.Container; @@ -54,7 +54,7 @@ import javax.swing.tree.MutableTreeNode; import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; import javax.xml.bind.DatatypeConverter; -import static megabasterd.MainPanel.VERSION; +import static com.tonikelope.megabasterd.MainPanel.VERSION; import org.apache.http.HttpException; import org.apache.http.HttpHost; import org.apache.http.HttpRequest; diff --git a/src/megabasterd/ProgressMeter.java b/src/main/java/com/tonikelope/megabasterd/ProgressMeter.java similarity index 98% rename from src/megabasterd/ProgressMeter.java rename to src/main/java/com/tonikelope/megabasterd/ProgressMeter.java index aef542ff3..f88115276 100644 --- a/src/megabasterd/ProgressMeter.java +++ b/src/main/java/com/tonikelope/megabasterd/ProgressMeter.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.util.logging.Level; import static java.util.logging.Level.SEVERE; diff --git a/src/megabasterd/SecureMultiThreadNotifiable.java b/src/main/java/com/tonikelope/megabasterd/SecureMultiThreadNotifiable.java similarity index 80% rename from src/megabasterd/SecureMultiThreadNotifiable.java rename to src/main/java/com/tonikelope/megabasterd/SecureMultiThreadNotifiable.java index e66748d8f..401012dc3 100644 --- a/src/megabasterd/SecureMultiThreadNotifiable.java +++ b/src/main/java/com/tonikelope/megabasterd/SecureMultiThreadNotifiable.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; /** * diff --git a/src/megabasterd/SecureSingleThreadNotifiable.java b/src/main/java/com/tonikelope/megabasterd/SecureSingleThreadNotifiable.java similarity index 80% rename from src/megabasterd/SecureSingleThreadNotifiable.java rename to src/main/java/com/tonikelope/megabasterd/SecureSingleThreadNotifiable.java index 94d5ada10..fa55ffd67 100644 --- a/src/megabasterd/SecureSingleThreadNotifiable.java +++ b/src/main/java/com/tonikelope/megabasterd/SecureSingleThreadNotifiable.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; /** * diff --git a/src/megabasterd/SetMasterPasswordDialog.form b/src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.form similarity index 100% rename from src/megabasterd/SetMasterPasswordDialog.form rename to src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.form diff --git a/src/megabasterd/SetMasterPasswordDialog.java b/src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.java similarity index 98% rename from src/megabasterd/SetMasterPasswordDialog.java rename to src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.java index d0cebd7a9..6a77a69a3 100644 --- a/src/megabasterd/SetMasterPasswordDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.awt.Dialog; import java.awt.event.KeyEvent; @@ -6,8 +6,8 @@ import java.util.Arrays; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.JOptionPane; -import static megabasterd.MainPanel.*; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MainPanel.*; +import static com.tonikelope.megabasterd.MiscTools.*; /** * diff --git a/src/megabasterd/SettingsDialog.form b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form similarity index 98% rename from src/megabasterd/SettingsDialog.form rename to src/main/java/com/tonikelope/megabasterd/SettingsDialog.form index 4291124b9..a6e49707b 100644 --- a/src/megabasterd/SettingsDialog.form +++ b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form @@ -67,7 +67,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -444,7 +444,7 @@ - + @@ -560,7 +560,7 @@ - + @@ -637,7 +637,7 @@ - + @@ -738,7 +738,7 @@ - + @@ -796,7 +796,7 @@ - + @@ -805,7 +805,7 @@ - + @@ -858,7 +858,7 @@ - + @@ -874,7 +874,7 @@ - + @@ -907,7 +907,7 @@ - + @@ -927,7 +927,7 @@ - + @@ -980,7 +980,7 @@ - + @@ -996,7 +996,7 @@ - + @@ -1022,7 +1022,7 @@ - + @@ -1079,7 +1079,7 @@ - + @@ -1304,7 +1304,7 @@ - + @@ -1319,7 +1319,7 @@ - + diff --git a/src/megabasterd/SettingsDialog.java b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java similarity index 98% rename from src/megabasterd/SettingsDialog.java rename to src/main/java/com/tonikelope/megabasterd/SettingsDialog.java index 305807473..bc123b419 100644 --- a/src/megabasterd/SettingsDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.awt.Dialog; import java.awt.Frame; @@ -30,9 +30,9 @@ import static javax.swing.JOptionPane.showOptionDialog; import javax.swing.JSpinner; import javax.swing.SpinnerNumberModel; import javax.swing.table.DefaultTableModel; -import static megabasterd.DBTools.*; -import static megabasterd.MainPanel.*; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.DBTools.*; +import static com.tonikelope.megabasterd.MainPanel.*; +import static com.tonikelope.megabasterd.MiscTools.*; /** * @@ -588,7 +588,7 @@ public final class SettingsDialog extends javax.swing.JDialog { setTitle("Settings"); save_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N - save_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-save-all-30.png"))); // NOI18N + save_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-save-all-30.png"))); // NOI18N save_button.setText("SAVE"); save_button.setDoubleBuffered(true); save_button.addActionListener(new java.awt.event.ActionListener() { @@ -598,7 +598,7 @@ public final class SettingsDialog extends javax.swing.JDialog { }); cancel_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N - cancel_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-cancel-30.png"))); // NOI18N + cancel_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-cancel-30.png"))); // NOI18N cancel_button.setText("CANCEL"); cancel_button.setDoubleBuffered(true); cancel_button.addActionListener(new java.awt.event.ActionListener() { @@ -669,7 +669,7 @@ public final class SettingsDialog extends javax.swing.JDialog { use_mega_account_down_combobox.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N change_download_dir_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N - change_download_dir_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-folder-30.png"))); // NOI18N + change_download_dir_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-folder-30.png"))); // NOI18N change_download_dir_button.setText("Change it"); change_download_dir_button.setDoubleBuffered(true); change_download_dir_button.addActionListener(new java.awt.event.ActionListener() { @@ -872,11 +872,11 @@ public final class SettingsDialog extends javax.swing.JDialog { downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(downloads_panelLayout.createSequentialGroup() .addContainerGap() - .addComponent(downloads_scroll_pane, javax.swing.GroupLayout.DEFAULT_SIZE, 473, Short.MAX_VALUE) + .addComponent(downloads_scroll_pane, javax.swing.GroupLayout.DEFAULT_SIZE, 468, Short.MAX_VALUE) .addContainerGap()) ); - jTabbedPane1.addTab("Downloads", new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-download-from-ftp-30.png")), downloads_panel); // NOI18N + jTabbedPane1.addTab("Downloads", new javax.swing.ImageIcon(getClass().getResource("/images/icons8-download-from-ftp-30.png")), downloads_panel); // NOI18N default_slots_up_label.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N default_slots_up_label.setText("Default slots per file:"); @@ -977,10 +977,10 @@ public final class SettingsDialog extends javax.swing.JDialog { .addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(max_up_speed_label) .addComponent(max_up_speed_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap(277, Short.MAX_VALUE)) + .addContainerGap(272, Short.MAX_VALUE)) ); - jTabbedPane1.addTab("Uploads", new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-upload-to-ftp-30.png")), uploads_panel); // NOI18N + jTabbedPane1.addTab("Uploads", new javax.swing.ImageIcon(getClass().getResource("/images/icons8-upload-to-ftp-30.png")), uploads_panel); // NOI18N mega_accounts_table.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N mega_accounts_table.setModel(new javax.swing.table.DefaultTableModel( @@ -1008,7 +1008,7 @@ public final class SettingsDialog extends javax.swing.JDialog { mega_accounts_label.setDoubleBuffered(true); remove_mega_account_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N - remove_mega_account_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-trash-can-30.png"))); // NOI18N + remove_mega_account_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-trash-can-30.png"))); // NOI18N remove_mega_account_button.setText("Remove selected"); remove_mega_account_button.setDoubleBuffered(true); remove_mega_account_button.setEnabled(false); @@ -1019,7 +1019,7 @@ public final class SettingsDialog extends javax.swing.JDialog { }); add_mega_account_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N - add_mega_account_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-plus-30.png"))); // NOI18N + add_mega_account_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-plus-30.png"))); // NOI18N add_mega_account_button.setText("Add account"); add_mega_account_button.setDoubleBuffered(true); add_mega_account_button.addActionListener(new java.awt.event.ActionListener() { @@ -1040,7 +1040,7 @@ public final class SettingsDialog extends javax.swing.JDialog { delete_all_accounts_button.setBackground(new java.awt.Color(255, 51, 0)); delete_all_accounts_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N delete_all_accounts_button.setForeground(new java.awt.Color(255, 255, 255)); - delete_all_accounts_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-trash-can-30.png"))); // NOI18N + delete_all_accounts_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-trash-can-30.png"))); // NOI18N delete_all_accounts_button.setText("RESET ACCOUNTS"); delete_all_accounts_button.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -1051,7 +1051,7 @@ public final class SettingsDialog extends javax.swing.JDialog { unlock_accounts_button.setBackground(new java.awt.Color(0, 153, 51)); unlock_accounts_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N unlock_accounts_button.setForeground(new java.awt.Color(255, 255, 255)); - unlock_accounts_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-key-2-30.png"))); // NOI18N + unlock_accounts_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-key-2-30.png"))); // NOI18N unlock_accounts_button.setText("Unlock accounts"); unlock_accounts_button.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -1088,7 +1088,7 @@ public final class SettingsDialog extends javax.swing.JDialog { elc_accounts_label.setDoubleBuffered(true); remove_elc_account_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N - remove_elc_account_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-trash-can-30.png"))); // NOI18N + remove_elc_account_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-trash-can-30.png"))); // NOI18N remove_elc_account_button.setText("Remove selected"); remove_elc_account_button.setDoubleBuffered(true); remove_elc_account_button.setEnabled(false); @@ -1099,7 +1099,7 @@ public final class SettingsDialog extends javax.swing.JDialog { }); add_elc_account_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N - add_elc_account_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-plus-30.png"))); // NOI18N + add_elc_account_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-plus-30.png"))); // NOI18N add_elc_account_button.setText("Add account"); add_elc_account_button.setDoubleBuffered(true); add_elc_account_button.addActionListener(new java.awt.event.ActionListener() { @@ -1156,7 +1156,7 @@ public final class SettingsDialog extends javax.swing.JDialog { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jLabel1) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(mega_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 122, Short.MAX_VALUE) + .addComponent(mega_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 120, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(accounts_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(remove_mega_account_button) @@ -1164,7 +1164,7 @@ public final class SettingsDialog extends javax.swing.JDialog { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(elc_accounts_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(elc_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 122, Short.MAX_VALUE) + .addComponent(elc_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 119, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(accounts_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(remove_elc_account_button) @@ -1172,7 +1172,7 @@ public final class SettingsDialog extends javax.swing.JDialog { .addContainerGap()) ); - jTabbedPane1.addTab("Accounts", new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-customer-30.png")), accounts_panel); // NOI18N + jTabbedPane1.addTab("Accounts", new javax.swing.ImageIcon(getClass().getResource("/images/icons8-customer-30.png")), accounts_panel); // NOI18N proxy_panel.setBorder(javax.swing.BorderFactory.createTitledBorder("Proxy settings")); @@ -1300,7 +1300,7 @@ public final class SettingsDialog extends javax.swing.JDialog { ); import_settings_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N - import_settings_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-import-30.png"))); // NOI18N + import_settings_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-import-30.png"))); // NOI18N import_settings_button.setText("IMPORT SETTINGS"); import_settings_button.setDoubleBuffered(true); import_settings_button.addActionListener(new java.awt.event.ActionListener() { @@ -1310,7 +1310,7 @@ public final class SettingsDialog extends javax.swing.JDialog { }); export_settings_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N - export_settings_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-export-30.png"))); // NOI18N + export_settings_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-export-30.png"))); // NOI18N export_settings_button.setText("EXPORT SETTINGS"); export_settings_button.setDoubleBuffered(true); export_settings_button.addActionListener(new java.awt.event.ActionListener() { @@ -1373,10 +1373,10 @@ public final class SettingsDialog extends javax.swing.JDialog { .addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(import_settings_button) .addComponent(export_settings_button)) - .addContainerGap(152, Short.MAX_VALUE)) + .addContainerGap(147, Short.MAX_VALUE)) ); - jTabbedPane1.addTab("Advanced", new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-administrative-tools-30.png")), advanced_panel); // NOI18N + jTabbedPane1.addTab("Advanced", new javax.swing.ImageIcon(getClass().getResource("/images/icons8-administrative-tools-30.png")), advanced_panel); // NOI18N status.setFont(new java.awt.Font("Dialog", 3, 14)); // NOI18N status.setForeground(new java.awt.Color(102, 102, 102)); diff --git a/src/megabasterd/SmartMegaProxyManager.java b/src/main/java/com/tonikelope/megabasterd/SmartMegaProxyManager.java similarity index 97% rename from src/megabasterd/SmartMegaProxyManager.java rename to src/main/java/com/tonikelope/megabasterd/SmartMegaProxyManager.java index 0fbd29be0..a0f18e44c 100644 --- a/src/megabasterd/SmartMegaProxyManager.java +++ b/src/main/java/com/tonikelope/megabasterd/SmartMegaProxyManager.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.awt.Color; import java.io.ByteArrayOutputStream; @@ -11,8 +11,8 @@ import java.util.Random; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.logging.Level; import java.util.logging.Logger; -import static megabasterd.MainPanel.THREAD_POOL; -import static megabasterd.MiscTools.getApacheKissHttpClient; +import static com.tonikelope.megabasterd.MainPanel.THREAD_POOL; +import static com.tonikelope.megabasterd.MiscTools.getApacheKissHttpClient; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; diff --git a/src/megabasterd/SqliteSingleton.java b/src/main/java/com/tonikelope/megabasterd/SqliteSingleton.java similarity index 97% rename from src/megabasterd/SqliteSingleton.java rename to src/main/java/com/tonikelope/megabasterd/SqliteSingleton.java index 4e1c45929..e6cc1243f 100644 --- a/src/megabasterd/SqliteSingleton.java +++ b/src/main/java/com/tonikelope/megabasterd/SqliteSingleton.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.sql.Connection; import java.sql.DriverManager; diff --git a/src/megabasterd/StreamChunk.java b/src/main/java/com/tonikelope/megabasterd/StreamChunk.java similarity index 96% rename from src/megabasterd/StreamChunk.java rename to src/main/java/com/tonikelope/megabasterd/StreamChunk.java index 1af9e8a49..360e3b13e 100644 --- a/src/megabasterd/StreamChunk.java +++ b/src/main/java/com/tonikelope/megabasterd/StreamChunk.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/megabasterd/StreamChunkDownloader.java b/src/main/java/com/tonikelope/megabasterd/StreamChunkDownloader.java similarity index 98% rename from src/megabasterd/StreamChunkDownloader.java rename to src/main/java/com/tonikelope/megabasterd/StreamChunkDownloader.java index 41d899919..65c14b37d 100644 --- a/src/megabasterd/StreamChunkDownloader.java +++ b/src/main/java/com/tonikelope/megabasterd/StreamChunkDownloader.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.io.IOException; import java.io.InputStream; @@ -6,11 +6,11 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.logging.Level; import java.util.logging.Logger; -import static megabasterd.MainPanel.*; import org.apache.http.HttpStatus; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; +import static com.tonikelope.megabasterd.MainPanel.*; /** * diff --git a/src/megabasterd/StreamChunkWriter.java b/src/main/java/com/tonikelope/megabasterd/StreamChunkWriter.java similarity index 98% rename from src/megabasterd/StreamChunkWriter.java rename to src/main/java/com/tonikelope/megabasterd/StreamChunkWriter.java index 9e9b4df8d..f20ae732f 100644 --- a/src/megabasterd/StreamChunkWriter.java +++ b/src/main/java/com/tonikelope/megabasterd/StreamChunkWriter.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.io.IOException; import java.io.InputStream; @@ -8,7 +8,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; /** * diff --git a/src/megabasterd/StreamThrottlerSupervisor.java b/src/main/java/com/tonikelope/megabasterd/StreamThrottlerSupervisor.java similarity index 99% rename from src/megabasterd/StreamThrottlerSupervisor.java rename to src/main/java/com/tonikelope/megabasterd/StreamThrottlerSupervisor.java index a7dc833b0..5cbe8d5c7 100644 --- a/src/megabasterd/StreamThrottlerSupervisor.java +++ b/src/main/java/com/tonikelope/megabasterd/StreamThrottlerSupervisor.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.util.Map; import java.util.Timer; diff --git a/src/megabasterd/StreamerDialog.form b/src/main/java/com/tonikelope/megabasterd/StreamerDialog.form similarity index 100% rename from src/megabasterd/StreamerDialog.form rename to src/main/java/com/tonikelope/megabasterd/StreamerDialog.form diff --git a/src/megabasterd/StreamerDialog.java b/src/main/java/com/tonikelope/megabasterd/StreamerDialog.java similarity index 98% rename from src/megabasterd/StreamerDialog.java rename to src/main/java/com/tonikelope/megabasterd/StreamerDialog.java index 9d29c3b4b..c2fb96fc4 100644 --- a/src/megabasterd/StreamerDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/StreamerDialog.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.awt.Dialog; import java.awt.event.WindowEvent; @@ -11,8 +11,8 @@ import java.util.logging.Logger; import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JOptionPane; -import static megabasterd.MainPanel.*; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MainPanel.*; /** * diff --git a/src/megabasterd/ThrottledInputStream.java b/src/main/java/com/tonikelope/megabasterd/ThrottledInputStream.java similarity index 99% rename from src/megabasterd/ThrottledInputStream.java rename to src/main/java/com/tonikelope/megabasterd/ThrottledInputStream.java index af9a46aca..9e47acf68 100644 --- a/src/megabasterd/ThrottledInputStream.java +++ b/src/main/java/com/tonikelope/megabasterd/ThrottledInputStream.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.io.IOException; import java.io.InputStream; diff --git a/src/megabasterd/ThrottledOutputStream.java b/src/main/java/com/tonikelope/megabasterd/ThrottledOutputStream.java similarity index 98% rename from src/megabasterd/ThrottledOutputStream.java rename to src/main/java/com/tonikelope/megabasterd/ThrottledOutputStream.java index 299a65328..23cdb7276 100644 --- a/src/megabasterd/ThrottledOutputStream.java +++ b/src/main/java/com/tonikelope/megabasterd/ThrottledOutputStream.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.io.IOException; import java.io.OutputStream; diff --git a/src/megabasterd/Transference.java b/src/main/java/com/tonikelope/megabasterd/Transference.java similarity index 96% rename from src/megabasterd/Transference.java rename to src/main/java/com/tonikelope/megabasterd/Transference.java index 15cc342c7..309eccc1a 100644 --- a/src/megabasterd/Transference.java +++ b/src/main/java/com/tonikelope/megabasterd/Transference.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/src/megabasterd/TransferenceManager.java b/src/main/java/com/tonikelope/megabasterd/TransferenceManager.java similarity index 99% rename from src/megabasterd/TransferenceManager.java rename to src/main/java/com/tonikelope/megabasterd/TransferenceManager.java index 794f2023f..3b82c28f9 100644 --- a/src/megabasterd/TransferenceManager.java +++ b/src/main/java/com/tonikelope/megabasterd/TransferenceManager.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.awt.Component; import java.awt.TrayIcon; @@ -8,8 +8,8 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.JPanel; -import static megabasterd.MainPanel.*; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MainPanel.*; /** * diff --git a/src/megabasterd/TransferenceView.java b/src/main/java/com/tonikelope/megabasterd/TransferenceView.java similarity index 92% rename from src/megabasterd/TransferenceView.java rename to src/main/java/com/tonikelope/megabasterd/TransferenceView.java index 03d27840a..8a4f5d39c 100644 --- a/src/megabasterd/TransferenceView.java +++ b/src/main/java/com/tonikelope/megabasterd/TransferenceView.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; /** * diff --git a/src/megabasterd/Upload.java b/src/main/java/com/tonikelope/megabasterd/Upload.java similarity index 99% rename from src/megabasterd/Upload.java rename to src/main/java/com/tonikelope/megabasterd/Upload.java index 11ae9613d..e40e2d0d2 100644 --- a/src/megabasterd/Upload.java +++ b/src/main/java/com/tonikelope/megabasterd/Upload.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.io.File; import static java.lang.Integer.MAX_VALUE; @@ -15,8 +15,8 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.JComponent; -import static megabasterd.MainPanel.*; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MainPanel.*; /** * @@ -951,7 +951,7 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN if (!_status_error && !_canceled) { - getView().getClose_button().setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-ok-30.png"))); + getView().getClose_button().setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-ok-30.png"))); } diff --git a/src/megabasterd/UploadMACGenerator.java b/src/main/java/com/tonikelope/megabasterd/UploadMACGenerator.java similarity index 98% rename from src/megabasterd/UploadMACGenerator.java rename to src/main/java/com/tonikelope/megabasterd/UploadMACGenerator.java index d7833299e..dee9c4d4a 100644 --- a/src/megabasterd/UploadMACGenerator.java +++ b/src/main/java/com/tonikelope/megabasterd/UploadMACGenerator.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.io.IOException; import java.io.InputStream; @@ -9,8 +9,8 @@ import java.util.logging.Logger; import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; -import static megabasterd.CryptTools.*; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.CryptTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; /** * diff --git a/src/megabasterd/UploadManager.java b/src/main/java/com/tonikelope/megabasterd/UploadManager.java similarity index 97% rename from src/megabasterd/UploadManager.java rename to src/main/java/com/tonikelope/megabasterd/UploadManager.java index 56afac383..cfc4a9e56 100644 --- a/src/megabasterd/UploadManager.java +++ b/src/main/java/com/tonikelope/megabasterd/UploadManager.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.awt.Component; import java.sql.SQLException; @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.concurrent.ConcurrentLinkedQueue; import static java.util.logging.Level.SEVERE; import java.util.logging.Logger; -import static megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.MiscTools.*; /** * diff --git a/src/megabasterd/UploadView.form b/src/main/java/com/tonikelope/megabasterd/UploadView.form similarity index 97% rename from src/megabasterd/UploadView.form rename to src/main/java/com/tonikelope/megabasterd/UploadView.form index 3e49eea31..d165f40cc 100644 --- a/src/megabasterd/UploadView.form +++ b/src/main/java/com/tonikelope/megabasterd/UploadView.form @@ -208,7 +208,7 @@ - + @@ -223,7 +223,7 @@ - + @@ -259,7 +259,7 @@ - + @@ -273,7 +273,7 @@ - + diff --git a/src/megabasterd/UploadView.java b/src/main/java/com/tonikelope/megabasterd/UploadView.java similarity index 97% rename from src/megabasterd/UploadView.java rename to src/main/java/com/tonikelope/megabasterd/UploadView.java index 24229fb14..6b8993a09 100644 --- a/src/megabasterd/UploadView.java +++ b/src/main/java/com/tonikelope/megabasterd/UploadView.java @@ -1,4 +1,4 @@ -package megabasterd; +package com.tonikelope.megabasterd; import java.awt.Color; import static java.lang.Integer.MAX_VALUE; @@ -10,9 +10,9 @@ import javax.swing.JOptionPane; import javax.swing.JProgressBar; import javax.swing.JSpinner; import javax.swing.SpinnerNumberModel; -import static megabasterd.MainPanel.*; -import static megabasterd.MiscTools.*; -import static megabasterd.Transference.*; +import static com.tonikelope.megabasterd.MiscTools.*; +import static com.tonikelope.megabasterd.Transference.*; +import static com.tonikelope.megabasterd.MainPanel.*; /** * @@ -179,7 +179,7 @@ public final class UploadView extends javax.swing.JPanel implements Transference file_name_label.setDoubleBuffered(true); close_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N - close_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-cancel-30.png"))); // NOI18N + close_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-cancel-30.png"))); // NOI18N close_button.setText("Close"); close_button.setDoubleBuffered(true); close_button.addActionListener(new java.awt.event.ActionListener() { @@ -189,7 +189,7 @@ public final class UploadView extends javax.swing.JPanel implements Transference }); restart_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N - restart_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-restart-30.png"))); // NOI18N + restart_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-restart-30.png"))); // NOI18N restart_button.setText("Restart"); restart_button.setDoubleBuffered(true); restart_button.addActionListener(new java.awt.event.ActionListener() { @@ -208,7 +208,7 @@ public final class UploadView extends javax.swing.JPanel implements Transference slot_status_label.setDoubleBuffered(true); folder_link_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N - folder_link_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-copy-to-clipboard-30.png"))); // NOI18N + folder_link_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-copy-to-clipboard-30.png"))); // NOI18N folder_link_button.setText("Copy folder link"); folder_link_button.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -217,7 +217,7 @@ public final class UploadView extends javax.swing.JPanel implements Transference }); file_link_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N - file_link_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-copy-to-clipboard-30.png"))); // NOI18N + file_link_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-copy-to-clipboard-30.png"))); // NOI18N file_link_button.setText("Copy file link"); file_link_button.setEnabled(false); file_link_button.addActionListener(new java.awt.event.ActionListener() { diff --git a/src/megabasterd/Itim-Regular.ttf b/src/main/resources/fonts/Itim-Regular.ttf similarity index 100% rename from src/megabasterd/Itim-Regular.ttf rename to src/main/resources/fonts/Itim-Regular.ttf diff --git a/src/megabasterd/dot_com.png b/src/main/resources/images/dot_com.png similarity index 100% rename from src/megabasterd/dot_com.png rename to src/main/resources/images/dot_com.png diff --git a/src/megabasterd/dot_com2.png b/src/main/resources/images/dot_com2.png similarity index 100% rename from src/megabasterd/dot_com2.png rename to src/main/resources/images/dot_com2.png diff --git a/src/megabasterd/icons/icons8-add-file-30.png b/src/main/resources/images/icons8-add-file-30.png similarity index 100% rename from src/megabasterd/icons/icons8-add-file-30.png rename to src/main/resources/images/icons8-add-file-30.png diff --git a/src/megabasterd/icons/icons8-add-folder-30.png b/src/main/resources/images/icons8-add-folder-30.png similarity index 100% rename from src/megabasterd/icons/icons8-add-folder-30.png rename to src/main/resources/images/icons8-add-folder-30.png diff --git a/src/megabasterd/icons/icons8-administrative-tools-30.png b/src/main/resources/images/icons8-administrative-tools-30.png similarity index 100% rename from src/megabasterd/icons/icons8-administrative-tools-30.png rename to src/main/resources/images/icons8-administrative-tools-30.png diff --git a/src/megabasterd/icons/icons8-cancel-30.png b/src/main/resources/images/icons8-cancel-30.png similarity index 100% rename from src/megabasterd/icons/icons8-cancel-30.png rename to src/main/resources/images/icons8-cancel-30.png diff --git a/src/megabasterd/icons/icons8-copy-to-clipboard-30.png b/src/main/resources/images/icons8-copy-to-clipboard-30.png similarity index 100% rename from src/megabasterd/icons/icons8-copy-to-clipboard-30.png rename to src/main/resources/images/icons8-copy-to-clipboard-30.png diff --git a/src/megabasterd/icons/icons8-customer-30.png b/src/main/resources/images/icons8-customer-30.png similarity index 100% rename from src/megabasterd/icons/icons8-customer-30.png rename to src/main/resources/images/icons8-customer-30.png diff --git a/src/megabasterd/icons/icons8-download-from-ftp-30.png b/src/main/resources/images/icons8-download-from-ftp-30.png similarity index 100% rename from src/megabasterd/icons/icons8-download-from-ftp-30.png rename to src/main/resources/images/icons8-download-from-ftp-30.png diff --git a/src/megabasterd/icons/icons8-export-30.png b/src/main/resources/images/icons8-export-30.png similarity index 100% rename from src/megabasterd/icons/icons8-export-30.png rename to src/main/resources/images/icons8-export-30.png diff --git a/src/megabasterd/icons/icons8-folder-30.png b/src/main/resources/images/icons8-folder-30.png similarity index 100% rename from src/megabasterd/icons/icons8-folder-30.png rename to src/main/resources/images/icons8-folder-30.png diff --git a/src/megabasterd/icons/icons8-import-30.png b/src/main/resources/images/icons8-import-30.png similarity index 100% rename from src/megabasterd/icons/icons8-import-30.png rename to src/main/resources/images/icons8-import-30.png diff --git a/src/megabasterd/icons/icons8-key-2-30.png b/src/main/resources/images/icons8-key-2-30.png similarity index 100% rename from src/megabasterd/icons/icons8-key-2-30.png rename to src/main/resources/images/icons8-key-2-30.png diff --git a/src/megabasterd/icons/icons8-minus-30.png b/src/main/resources/images/icons8-minus-30.png similarity index 100% rename from src/megabasterd/icons/icons8-minus-30.png rename to src/main/resources/images/icons8-minus-30.png diff --git a/src/megabasterd/icons/icons8-ok-30.png b/src/main/resources/images/icons8-ok-30.png similarity index 100% rename from src/megabasterd/icons/icons8-ok-30.png rename to src/main/resources/images/icons8-ok-30.png diff --git a/src/megabasterd/icons/icons8-plus-30.png b/src/main/resources/images/icons8-plus-30.png similarity index 100% rename from src/megabasterd/icons/icons8-plus-30.png rename to src/main/resources/images/icons8-plus-30.png diff --git a/src/megabasterd/icons/icons8-restart-30.png b/src/main/resources/images/icons8-restart-30.png similarity index 100% rename from src/megabasterd/icons/icons8-restart-30.png rename to src/main/resources/images/icons8-restart-30.png diff --git a/src/megabasterd/icons/icons8-save-all-30.png b/src/main/resources/images/icons8-save-all-30.png similarity index 100% rename from src/megabasterd/icons/icons8-save-all-30.png rename to src/main/resources/images/icons8-save-all-30.png diff --git a/src/megabasterd/icons/icons8-services-30.png b/src/main/resources/images/icons8-services-30.png similarity index 100% rename from src/megabasterd/icons/icons8-services-30.png rename to src/main/resources/images/icons8-services-30.png diff --git a/src/megabasterd/icons/icons8-shutdown-30.png b/src/main/resources/images/icons8-shutdown-30.png similarity index 100% rename from src/megabasterd/icons/icons8-shutdown-30.png rename to src/main/resources/images/icons8-shutdown-30.png diff --git a/src/megabasterd/icons/icons8-trash-can-30.png b/src/main/resources/images/icons8-trash-can-30.png similarity index 100% rename from src/megabasterd/icons/icons8-trash-can-30.png rename to src/main/resources/images/icons8-trash-can-30.png diff --git a/src/megabasterd/icons/icons8-undelete-30.png b/src/main/resources/images/icons8-undelete-30.png similarity index 100% rename from src/megabasterd/icons/icons8-undelete-30.png rename to src/main/resources/images/icons8-undelete-30.png diff --git a/src/megabasterd/icons/icons8-upload-to-ftp-30.png b/src/main/resources/images/icons8-upload-to-ftp-30.png similarity index 100% rename from src/megabasterd/icons/icons8-upload-to-ftp-30.png rename to src/main/resources/images/icons8-upload-to-ftp-30.png diff --git a/src/megabasterd/icons/icons8-video-playlist-30.png b/src/main/resources/images/icons8-video-playlist-30.png similarity index 100% rename from src/megabasterd/icons/icons8-video-playlist-30.png rename to src/main/resources/images/icons8-video-playlist-30.png diff --git a/src/megabasterd/lock_medium.png b/src/main/resources/images/lock_medium.png similarity index 100% rename from src/megabasterd/lock_medium.png rename to src/main/resources/images/lock_medium.png diff --git a/src/megabasterd/made_in_spain.jpg b/src/main/resources/images/made_in_spain.jpg similarity index 100% rename from src/megabasterd/made_in_spain.jpg rename to src/main/resources/images/made_in_spain.jpg diff --git a/src/main/resources/images/mbasterd_32.png b/src/main/resources/images/mbasterd_32.png new file mode 100644 index 000000000..b32aeeb28 Binary files /dev/null and b/src/main/resources/images/mbasterd_32.png differ diff --git a/src/megabasterd/mbasterd_logo_git.png b/src/main/resources/images/mbasterd_logo_git.png similarity index 100% rename from src/megabasterd/mbasterd_logo_git.png rename to src/main/resources/images/mbasterd_logo_git.png diff --git a/src/megabasterd/mbasterd_logo_nuevo.png b/src/main/resources/images/mbasterd_logo_nuevo.png similarity index 100% rename from src/megabasterd/mbasterd_logo_nuevo.png rename to src/main/resources/images/mbasterd_logo_nuevo.png diff --git a/src/megabasterd/mbasterd_med.png b/src/main/resources/images/mbasterd_med.png similarity index 100% rename from src/megabasterd/mbasterd_med.png rename to src/main/resources/images/mbasterd_med.png diff --git a/src/megabasterd/mbasterd_mini.png b/src/main/resources/images/mbasterd_mini.png similarity index 100% rename from src/megabasterd/mbasterd_mini.png rename to src/main/resources/images/mbasterd_mini.png diff --git a/src/megabasterd/mbasterd_screen.png b/src/main/resources/images/mbasterd_screen.png similarity index 100% rename from src/megabasterd/mbasterd_screen.png rename to src/main/resources/images/mbasterd_screen.png diff --git a/src/megabasterd/mega_crypter.png b/src/main/resources/images/mega_crypter.png similarity index 100% rename from src/megabasterd/mega_crypter.png rename to src/main/resources/images/mega_crypter.png diff --git a/src/megabasterd/pica_roja.ico b/src/main/resources/images/pica_roja.ico similarity index 100% rename from src/megabasterd/pica_roja.ico rename to src/main/resources/images/pica_roja.ico diff --git a/src/megabasterd/pica_roja_big.png b/src/main/resources/images/pica_roja_big.png similarity index 100% rename from src/megabasterd/pica_roja_big.png rename to src/main/resources/images/pica_roja_big.png