Replace protected with private access modifier for generated constructors with explicit Parcel parameter

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+##Version 0.7.1
+
+* Replaced `protected` with `private` access modifier for generated constructors with explicit `Parcel` parameter.
+* Removed lint warning: `Access can be private`.
+
 ##Version 0.7.0
 
 * Added map parcelation

ParcelableTestApp/app/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }
 apply plugin: 'com.android.application'
@@ -13,20 +13,20 @@ repositories {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "com.example.sampleapp.app"
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_6
-        targetCompatibility JavaVersion.VERSION_1_6
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
     }
     buildTypes {
         release {
@@ -38,5 +38,5 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:appcompat-v7:25.2.0'
 }

ParcelableTestApp/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:2.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

ParcelableTestApp/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Fri Feb 24 16:52:45 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

android-parcelable-intellij-plugin.iml

@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
-  <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+  <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/resources/META-INF/plugin.xml" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/.idea" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

resources/META-INF/plugin.xml

@@ -0,0 +1,61 @@
+<!--
+/*
+** Copyright (C) 2013 Michał Charmas (http://blog.charmas.pl)
+**
+** 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
+**
+**     http://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.
+*/
+-->
+<idea-plugin version="8">
+  <id>pl.charmas.parcelablegenerator</id>
+  <name>Android Parcelable code generator</name>
+  <version>0.7.1</version>
+  <vendor email="michal@charmas.pl" url="http://blog.charmas.pl">Michal Charmas</vendor>
+
+  <description><![CDATA[
+            Plugin which generates Android Parcelable boilerplate code for you.
+      ]]></description>
+
+  <change-notes><![CDATA[
+            ]]>
+  </change-notes>
+
+  <!-- please see http://confluence.jetbrains.net/display/IDEADEV/Build+Number+Ranges for description -->
+  <idea-version since-build="145.0"/>
+
+  <!-- please see http://confluence.jetbrains.net/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
+       on how to target different products -->
+  <!-- uncomment to enable plugin in all products
+  <depends>com.intellij.modules.lang</depends>
+  -->
+
+  <application-components>
+    <!-- Add your application components here -->
+  </application-components>
+
+  <project-components>
+    <!-- Add your project components here -->
+  </project-components>
+
+  <actions>
+    <!-- Add your actions here -->
+    <action id="generateParcelableNew" class="pl.charmas.parcelablegenerator.ParcelableAction"
+        text="Parcelable"
+        description="Generates Android Parcelable based on class fields">
+      <add-to-group group-id="GenerateGroup" anchor="last"/>
+    </action>
+  </actions>
+
+  <extensions defaultExtensionNs="com.intellij">
+    <!-- Add your extensions here -->
+  </extensions>
+</idea-plugin>

src/pl/charmas/parcelablegenerator/CodeGenerator.java

@@ -15,14 +15,21 @@
  */
 package pl.charmas.parcelablegenerator;
 
-import com.intellij.psi.*;
+import com.intellij.psi.JavaPsiFacade;
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiClassType;
+import com.intellij.psi.PsiElementFactory;
+import com.intellij.psi.PsiField;
+import com.intellij.psi.PsiJavaCodeReferenceElement;
+import com.intellij.psi.PsiMethod;
+import com.intellij.psi.PsiParameter;
+import com.intellij.psi.PsiParameterList;
+import com.intellij.psi.PsiReferenceList;
 import com.intellij.psi.codeStyle.JavaCodeStyleManager;
+import java.util.List;
 import pl.charmas.parcelablegenerator.typeserializers.*;
 import pl.charmas.parcelablegenerator.util.PsiUtils;
 
-import java.util.List;
-
-
 /**
  * Quite a few changes here by Dallas Gutauckis [dallas@gutauckis.com]
  */
@@ -72,7 +79,7 @@ private String generateStaticCreator(PsiClass psiClass) {
     private String generateConstructor(List<PsiField> fields, PsiClass psiClass) {
         String className = psiClass.getName();
 
-        StringBuilder sb = new StringBuilder("protected ");
+        StringBuilder sb = new StringBuilder("private ");
 
         // Create the Parcelable-required constructor
         sb.append(className).append("(android.os.Parcel in) {");

src/pl/charmas/parcelablegenerator/GenerateDialog.java

@@ -26,16 +26,13 @@
 import com.intellij.ui.components.JBCheckBox;
 import com.intellij.ui.components.JBList;
 import com.intellij.ui.components.panels.VerticalBox;
-
-import org.jetbrains.annotations.Nullable;
-
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.swing.JComponent;
 import javax.swing.JPanel;
+import org.jetbrains.annotations.Nullable;
 
 public class GenerateDialog extends DialogWrapper {
 

src/pl/charmas/parcelablegenerator/ParcelableAction.java

@@ -26,7 +26,6 @@
 import com.intellij.psi.PsiField;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
-
 import java.util.List;
 
 public class ParcelableAction extends AnAction {

src/pl/charmas/parcelablegenerator/typeserializers/BundleSerializerFactory.java

@@ -1,7 +1,6 @@
 package pl.charmas.parcelablegenerator.typeserializers;
 
 import com.intellij.psi.PsiType;
-
 import pl.charmas.parcelablegenerator.typeserializers.serializers.BundleSerializer;
 
 /**

src/pl/charmas/parcelablegenerator/typeserializers/ChainSerializerFactory.java

@@ -16,39 +16,38 @@
 package pl.charmas.parcelablegenerator.typeserializers;
 
 import com.intellij.psi.PsiType;
-import pl.charmas.parcelablegenerator.typeserializers.serializers.ParcelableObjectSerializer;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import pl.charmas.parcelablegenerator.typeserializers.serializers.ParcelableObjectSerializer;
 
 public class ChainSerializerFactory implements TypeSerializerFactory {
 
-    private final List<TypeSerializerFactory> factories;
+  private final List<TypeSerializerFactory> factories;
 
-    public ChainSerializerFactory(TypeSerializerFactory... factories) {
-        this.factories = Arrays.asList(factories);
-    }
+  public ChainSerializerFactory(TypeSerializerFactory... factories) {
+    this.factories = Arrays.asList(factories);
+  }
 
-    private ChainSerializerFactory(List<TypeSerializerFactory> factories) {
-        this.factories = Collections.unmodifiableList(factories);
-    }
-
-    @Override
-    public TypeSerializer getSerializer(PsiType psiType) {
-        for (TypeSerializerFactory factory : factories) {
-            TypeSerializer serializer = factory.getSerializer(psiType);
-            if (serializer != null) {
-                return serializer;
-            }
-        }
-        return new ParcelableObjectSerializer();
-    }
+  private ChainSerializerFactory(List<TypeSerializerFactory> factories) {
+    this.factories = Collections.unmodifiableList(factories);
+  }
 
-    public TypeSerializerFactory extend(MapSerializerFactory factoryToAdd) {
-        List<TypeSerializerFactory> factories = new ArrayList<TypeSerializerFactory>(this.factories);
-        factories.add(factoryToAdd);
-        return new ChainSerializerFactory(factories);
+  @Override
+  public TypeSerializer getSerializer(PsiType psiType) {
+    for (TypeSerializerFactory factory : factories) {
+      TypeSerializer serializer = factory.getSerializer(psiType);
+      if (serializer != null) {
+        return serializer;
+      }
     }
+    return new ParcelableObjectSerializer();
+  }
+
+  public TypeSerializerFactory extend(MapSerializerFactory factoryToAdd) {
+    List<TypeSerializerFactory> factories = new ArrayList<TypeSerializerFactory>(this.factories);
+    factories.add(factoryToAdd);
+    return new ChainSerializerFactory(factories);
+  }
 }

src/pl/charmas/parcelablegenerator/typeserializers/DateSerializerFactory.java

@@ -1,7 +1,6 @@
 package pl.charmas.parcelablegenerator.typeserializers;
 
 import com.intellij.psi.PsiType;
-
 import pl.charmas.parcelablegenerator.typeserializers.serializers.DateSerializer;
 
 /**

src/pl/charmas/parcelablegenerator/typeserializers/EnumerationSerializerFactory.java

@@ -2,7 +2,6 @@
 
 import com.intellij.psi.PsiType;
 import com.intellij.psi.impl.source.PsiClassReferenceType;
-
 import pl.charmas.parcelablegenerator.typeserializers.serializers.EnumerationSerializer;
 
 /**

src/pl/charmas/parcelablegenerator/typeserializers/ListSerializerFactory.java

@@ -16,7 +16,6 @@
 package pl.charmas.parcelablegenerator.typeserializers;
 
 import com.intellij.psi.PsiType;
-
 import pl.charmas.parcelablegenerator.typeserializers.serializers.GenericListSerializer;
 import pl.charmas.parcelablegenerator.util.PsiUtils;
 

src/pl/charmas/parcelablegenerator/typeserializers/ParcelableSerializerFactory.java

@@ -1,9 +1,7 @@
 package pl.charmas.parcelablegenerator.typeserializers;
 
 import com.intellij.psi.PsiType;
-
 import java.util.List;
-
 import pl.charmas.parcelablegenerator.typeserializers.serializers.ParcelableArraySerializer;
 import pl.charmas.parcelablegenerator.typeserializers.serializers.ParcelableListSerializer;
 import pl.charmas.parcelablegenerator.typeserializers.serializers.ParcelableObjectSerializer;

src/pl/charmas/parcelablegenerator/typeserializers/PrimitiveArraySerializerFactory.java

@@ -16,9 +16,7 @@
 package pl.charmas.parcelablegenerator.typeserializers;
 
 import com.intellij.psi.PsiType;
-
 import java.util.HashMap;
-
 import pl.charmas.parcelablegenerator.typeserializers.serializers.BooleanSparseArraySerializer;
 import pl.charmas.parcelablegenerator.typeserializers.serializers.PrimitiveArraySerializer;