diff --git a/.gitignore b/.gitignore index dbf2e0e..f92b8ac 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ out/ .DS_Store build/ *.zip +.gradle # Build output android-parcelable-intellij-plugin.jar diff --git a/README.md b/README.md index 730cc7d..30df05b 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,15 @@ Just press **ALT + Insert** (or your equivalent keybinding for code generation) * [Michał Charmas](https://github.com/mcharmas/) * [Dallas Gutauckis](http://github.com/dallasgutauckis) + * [Karsten Ohme](http://github.com/koh-osug) + +## Development + +Copy the file `gradle.properties.set-me-up` to `gradle.properties` +and set the path to your Android Studio installation. + +__NOTE:__ Ubuntu users using snap must pay attention that a mounted snap is not writeable. For the +compilation use a writeable copy of Android studio. ## License diff --git a/android-parcelable-intellij-plugin.iml b/android-parcelable-intellij-plugin.iml deleted file mode 100644 index 37317b3..0000000 --- a/android-parcelable-intellij-plugin.iml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..4985d0f --- /dev/null +++ b/build.gradle @@ -0,0 +1,47 @@ +plugins { + id 'org.jetbrains.intellij' version '0.4.21' +} + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +apply plugin: 'java' + +group 'pl.charmas' +version '0.7.1' + +repositories { + mavenCentral() +} + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.12' +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + plugins 'java' + updateSinceUntilBuild false + sameSinceUntilBuild true + intellij.localPath = project.hasProperty("StudioRunPath") ? StudioRunPath : StudioCompilePath +} +patchPluginXml { + changeNotes """ + Added support for generating readFromParcel""" +} + +runIde { + // Absolute path to installed target Android Studio to use as IDE Development Instance + ideDirectory "$StudioCompilePath" +} + +task(verifySetup) { + doLast { + def ideaJar = "$StudioCompilePath/lib/idea.jar" + if (!file(ideaJar).exists()) { + throw new GradleException("$ideaJar not found, set StudioCompilePath in gradle.properties") + } + } +} + +compileJava.dependsOn verifySetup \ No newline at end of file diff --git a/gradle.properties.set-me-up b/gradle.properties.set-me-up new file mode 100644 index 0000000..b7a312c --- /dev/null +++ b/gradle.properties.set-me-up @@ -0,0 +1 @@ +StudioCompilePath=/android-studio \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..62d4c05 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..622ab64 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..fbd7c51 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..5093609 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,104 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..45a87cd --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'android-parcelable-intellij-plugin' + diff --git a/src/pl/charmas/parcelablegenerator/CodeGenerator.java b/src/main/java/pl/charmas/parcelablegenerator/CodeGenerator.java similarity index 92% rename from src/pl/charmas/parcelablegenerator/CodeGenerator.java rename to src/main/java/pl/charmas/parcelablegenerator/CodeGenerator.java index cf46ed9..2d2f9a4 100644 --- a/src/pl/charmas/parcelablegenerator/CodeGenerator.java +++ b/src/main/java/pl/charmas/parcelablegenerator/CodeGenerator.java @@ -116,6 +116,20 @@ private String generateWriteToParcel(List fields) { return sb.toString(); } + private String generateReadFromToParcel(List fields) { + StringBuilder sb = new StringBuilder("public void readFromParcel(android.os.Parcel source) {"); + if (hasParcelableSuperclass() && hasSuperMethod("readFromParcel")) { + sb.append("super.readFromParcel(source);"); + } + for (PsiField field : fields) { + sb.append(getSerializerForType(field).readValue(SerializableValue.member(field), "source")); + } + + sb.append("}"); + + return sb.toString(); + } + private boolean hasSuperMethod(String methodName) { if (methodName == null) return false; @@ -148,6 +162,8 @@ public void generate() { PsiMethod describeContentsMethod = elementFactory.createMethodFromText(generateDescribeContents(), mClass); // Method for writing to the parcel PsiMethod writeToParcelMethod = elementFactory.createMethodFromText(generateWriteToParcel(mFields), mClass); + // Method for reading from the parcel + PsiMethod readFromParcelMethod = elementFactory.createMethodFromText(generateReadFromToParcel(mFields), mClass); // Default constructor if needed String defaultConstructorString = generateDefaultConstructor(mClass); @@ -167,6 +183,7 @@ public void generate() { // Shorten all class references styleManager.shortenClassReferences(mClass.addBefore(describeContentsMethod, mClass.getLastChild())); styleManager.shortenClassReferences(mClass.addBefore(writeToParcelMethod, mClass.getLastChild())); + styleManager.shortenClassReferences(mClass.addBefore(readFromParcelMethod, mClass.getLastChild())); // Only adds if available if (defaultConstructor != null) { diff --git a/src/pl/charmas/parcelablegenerator/GenerateDialog.java b/src/main/java/pl/charmas/parcelablegenerator/GenerateDialog.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/GenerateDialog.java rename to src/main/java/pl/charmas/parcelablegenerator/GenerateDialog.java diff --git a/src/pl/charmas/parcelablegenerator/ParcelableAction.java b/src/main/java/pl/charmas/parcelablegenerator/ParcelableAction.java similarity index 89% rename from src/pl/charmas/parcelablegenerator/ParcelableAction.java rename to src/main/java/pl/charmas/parcelablegenerator/ParcelableAction.java index 7830c76..4fffe2d 100644 --- a/src/pl/charmas/parcelablegenerator/ParcelableAction.java +++ b/src/main/java/pl/charmas/parcelablegenerator/ParcelableAction.java @@ -44,12 +44,9 @@ public void actionPerformed(AnActionEvent e) { } private void generateParcelable(final PsiClass psiClass, final List fields) { - new WriteCommandAction.Simple(psiClass.getProject(), psiClass.getContainingFile()) { - @Override - protected void run() throws Throwable { - new CodeGenerator(psiClass, fields).generate(); - } - }.execute(); + WriteCommandAction.writeCommandAction(psiClass.getProject(), psiClass.getContainingFile()).run( + () -> new CodeGenerator(psiClass, fields).generate() + ); } diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/BundleSerializerFactory.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/BundleSerializerFactory.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/BundleSerializerFactory.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/BundleSerializerFactory.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/ChainSerializerFactory.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/ChainSerializerFactory.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/ChainSerializerFactory.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/ChainSerializerFactory.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/DateSerializerFactory.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/DateSerializerFactory.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/DateSerializerFactory.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/DateSerializerFactory.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/EnumerationSerializerFactory.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/EnumerationSerializerFactory.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/EnumerationSerializerFactory.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/EnumerationSerializerFactory.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/ListSerializerFactory.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/ListSerializerFactory.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/ListSerializerFactory.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/ListSerializerFactory.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/MapSerializerFactory.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/MapSerializerFactory.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/MapSerializerFactory.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/MapSerializerFactory.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/ParcelableSerializerFactory.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/ParcelableSerializerFactory.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/ParcelableSerializerFactory.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/ParcelableSerializerFactory.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/PrimitiveArraySerializerFactory.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/PrimitiveArraySerializerFactory.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/PrimitiveArraySerializerFactory.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/PrimitiveArraySerializerFactory.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/PrimitiveTypeArraySerializerFactory.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/PrimitiveTypeArraySerializerFactory.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/PrimitiveTypeArraySerializerFactory.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/PrimitiveTypeArraySerializerFactory.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/PrimitiveTypeSerializerFactory.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/PrimitiveTypeSerializerFactory.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/PrimitiveTypeSerializerFactory.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/PrimitiveTypeSerializerFactory.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/SerializableSerializerFactory.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/SerializableSerializerFactory.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/SerializableSerializerFactory.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/SerializableSerializerFactory.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/SerializableValue.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/SerializableValue.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/SerializableValue.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/SerializableValue.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/SparseArraySerializerFactory.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/SparseArraySerializerFactory.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/SparseArraySerializerFactory.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/SparseArraySerializerFactory.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/TypeSerializer.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/TypeSerializer.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/TypeSerializer.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/TypeSerializer.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/TypeSerializerFactory.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/TypeSerializerFactory.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/TypeSerializerFactory.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/TypeSerializerFactory.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/serializers/BooleanPrimitiveSerializer.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/BooleanPrimitiveSerializer.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/serializers/BooleanPrimitiveSerializer.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/BooleanPrimitiveSerializer.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/serializers/BooleanSparseArraySerializer.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/BooleanSparseArraySerializer.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/serializers/BooleanSparseArraySerializer.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/BooleanSparseArraySerializer.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/serializers/BundleSerializer.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/BundleSerializer.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/serializers/BundleSerializer.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/BundleSerializer.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/serializers/CharPrimitiveSerializer.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/CharPrimitiveSerializer.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/serializers/CharPrimitiveSerializer.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/CharPrimitiveSerializer.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/serializers/DateSerializer.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/DateSerializer.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/serializers/DateSerializer.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/DateSerializer.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/serializers/EnumerationSerializer.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/EnumerationSerializer.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/serializers/EnumerationSerializer.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/EnumerationSerializer.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/serializers/GenericListSerializer.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/GenericListSerializer.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/serializers/GenericListSerializer.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/GenericListSerializer.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/serializers/MapSerializer.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/MapSerializer.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/serializers/MapSerializer.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/MapSerializer.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/serializers/NullablePrimitivesArraySerializer.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/NullablePrimitivesArraySerializer.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/serializers/NullablePrimitivesArraySerializer.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/NullablePrimitivesArraySerializer.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/serializers/NullablePrimitivesSerializer.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/NullablePrimitivesSerializer.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/serializers/NullablePrimitivesSerializer.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/NullablePrimitivesSerializer.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/serializers/ParcelableArraySerializer.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/ParcelableArraySerializer.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/serializers/ParcelableArraySerializer.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/ParcelableArraySerializer.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/serializers/ParcelableListSerializer.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/ParcelableListSerializer.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/serializers/ParcelableListSerializer.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/ParcelableListSerializer.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/serializers/ParcelableObjectSerializer.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/ParcelableObjectSerializer.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/serializers/ParcelableObjectSerializer.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/ParcelableObjectSerializer.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/serializers/PrimitiveArraySerializer.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/PrimitiveArraySerializer.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/serializers/PrimitiveArraySerializer.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/PrimitiveArraySerializer.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/serializers/PrimitiveTypeSerializer.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/PrimitiveTypeSerializer.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/serializers/PrimitiveTypeSerializer.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/PrimitiveTypeSerializer.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/serializers/SerializableObjectSerializer.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/SerializableObjectSerializer.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/serializers/SerializableObjectSerializer.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/SerializableObjectSerializer.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/serializers/ShortPrimitiveSerializer.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/ShortPrimitiveSerializer.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/serializers/ShortPrimitiveSerializer.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/ShortPrimitiveSerializer.java diff --git a/src/pl/charmas/parcelablegenerator/typeserializers/serializers/SparseArraySerializer.java b/src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/SparseArraySerializer.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/typeserializers/serializers/SparseArraySerializer.java rename to src/main/java/pl/charmas/parcelablegenerator/typeserializers/serializers/SparseArraySerializer.java diff --git a/src/pl/charmas/parcelablegenerator/util/PsiUtils.java b/src/main/java/pl/charmas/parcelablegenerator/util/PsiUtils.java similarity index 100% rename from src/pl/charmas/parcelablegenerator/util/PsiUtils.java rename to src/main/java/pl/charmas/parcelablegenerator/util/PsiUtils.java diff --git a/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml similarity index 84% rename from META-INF/plugin.xml rename to src/main/resources/META-INF/plugin.xml index 921a1a4..3db29d5 100644 --- a/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -15,10 +15,10 @@ ** limitations under the License. */ --> - + pl.charmas.parcelablegenerator - Android Parcelable code generator - 0.7.0 + Android Parcelable Code Generator + 0.7.1 Michal Charmas - - - + + + \ No newline at end of file