[jbosstools-commits] JBoss Tools SVN: r14247 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa: collect and 2 other directories.

Tuesday, 17 March 2009


Author: vyemialyanchyk
Date: 2009-03-17 15:35:56 -0400 (Tue, 17 Mar 2009)
New Revision: 14247

Modified:
  
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
  
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
  
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/JPAConst.java
  
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java
Log:
code review, change store preferences to simple string name instead of class name

Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
===================================================================
---
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java	2009-03-17
19:33:42 UTC (rev 14246)
+++
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java	2009-03-17
19:35:56 UTC (rev 14247)
@@ -87,6 +87,10 @@
 	protected AllEntitiesProcessor processor = new AllEntitiesProcessor();
 
 	protected JPAMapToolActor() {
+		initAnnotationStylePreference();
+	}
+
+	public void initAnnotationStylePreference() {
 		processor.initAnnotationStylePreference();
 	}
 
@@ -384,4 +388,17 @@
 		this.selection = selection;
 	}
 
+	// setters for testing
+
+	public void setAllEntitiesInfoCollector(AllEntitiesInfoCollector collector) {
+		this.collector = collector;
+	}
+
+	public void setAllEntitiesProcessor(AllEntitiesProcessor processor) {
+		this.processor = processor;
+	}
+
+	public void setSelectionCU(Set<ICompilationUnit> selectionCU) {
+		this.selectionCU = selectionCU;
+	}
 }

Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
===================================================================
---
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java	2009-03-17
19:33:42 UTC (rev 14246)
+++
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java	2009-03-17
19:35:56 UTC (rev 14247)
@@ -665,12 +665,13 @@
 		CollectEntityInfo finder = new CollectEntityInfo();
 		cu.accept(finder);
 		EntityInfo result = finder.getEntityInfo();
-		result.adjustParameters();
+		Iterator<String> it = null;
 		if (result != null) {
+			result.adjustParameters();
 			mapCUs_Info.put(fullyQualifiedName, result);
+			it = result.getDependences();
 		}
-		Iterator<String> it = result.getDependences();
-		while (it.hasNext()) {
+		if (it != null) while (it.hasNext()) {
 			String fullyQualifiedNameTmp = it.next();
 			collect(fullyQualifiedNameTmp);
 		}

Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/JPAConst.java
===================================================================
---
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/JPAConst.java	2009-03-17
19:33:42 UTC (rev 14246)
+++
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/JPAConst.java	2009-03-17
19:35:56 UTC (rev 14247)
@@ -10,27 +10,27 @@
  */
 public class JPAConst {
 
-	static public String IMPORT_SERIALIZABLE = "java.io.Serializable";
//$NON-NLS-1$
-	static public String IMPORT_ENTITY = "javax.persistence.Entity";
//$NON-NLS-1$
-	static public String IMPORT_GENERATED_VALUE =
"javax.persistence.GeneratedValue"; //$NON-NLS-1$
-	static public String IMPORT_ID = "javax.persistence.Id"; //$NON-NLS-1$
-	static public String IMPORT_JOINCOLUMN = "javax.persistence.JoinColumn";
//$NON-NLS-1$
-	static public String IMPORT_ONE2ONE = "javax.persistence.OneToOne";
//$NON-NLS-1$
-	static public String IMPORT_ONE2MANY = "javax.persistence.OneToMany";
//$NON-NLS-1$
-	static public String IMPORT_MANY2ONE = "javax.persistence.ManyToOne";
//$NON-NLS-1$
-	static public String IMPORT_MANY2MANY = "javax.persistence.ManyToMany";
//$NON-NLS-1$
+	public static final String IMPORT_SERIALIZABLE = "java.io.Serializable";
//$NON-NLS-1$
+	public static final String IMPORT_ENTITY = "javax.persistence.Entity";
//$NON-NLS-1$
+	public static final String IMPORT_GENERATED_VALUE =
"javax.persistence.GeneratedValue"; //$NON-NLS-1$
+	public static final String IMPORT_ID = "javax.persistence.Id"; //$NON-NLS-1$
+	public static final String IMPORT_JOINCOLUMN = "javax.persistence.JoinColumn";
//$NON-NLS-1$
+	public static final String IMPORT_ONE2ONE = "javax.persistence.OneToOne";
//$NON-NLS-1$
+	public static final String IMPORT_ONE2MANY = "javax.persistence.OneToMany";
//$NON-NLS-1$
+	public static final String IMPORT_MANY2ONE = "javax.persistence.ManyToOne";
//$NON-NLS-1$
+	public static final String IMPORT_MANY2MANY = "javax.persistence.ManyToMany";
//$NON-NLS-1$
 	
-	static public String ANNOTATION_SERIALIZABLE = "Serializable"; //$NON-NLS-1$
-	static public String ANNOTATION_ENTITY = "Entity"; //$NON-NLS-1$
-	static public String ANNOTATION_GENERATED_VALUE = "GeneratedValue";
//$NON-NLS-1$
-	static public String ANNOTATION_ID = "Id"; //$NON-NLS-1$
-	static public String ANNOTATION_JOINCOLUMN = "JoinColumn"; //$NON-NLS-1$
-	static public String ANNOTATION_ONE2ONE = "OneToOne"; //$NON-NLS-1$
-	static public String ANNOTATION_ONE2MANY = "OneToMany"; //$NON-NLS-1$
-	static public String ANNOTATION_MANY2ONE = "ManyToOne"; //$NON-NLS-1$
-	static public String ANNOTATION_MANY2MANY = "ManyToMany"; //$NON-NLS-1$
+	public static final String ANNOTATION_SERIALIZABLE = "Serializable";
//$NON-NLS-1$
+	public static final String ANNOTATION_ENTITY = "Entity"; //$NON-NLS-1$
+	public static final String ANNOTATION_GENERATED_VALUE = "GeneratedValue";
//$NON-NLS-1$
+	public static final String ANNOTATION_ID = "Id"; //$NON-NLS-1$
+	public static final String ANNOTATION_JOINCOLUMN = "JoinColumn";
//$NON-NLS-1$
+	public static final String ANNOTATION_ONE2ONE = "OneToOne"; //$NON-NLS-1$
+	public static final String ANNOTATION_ONE2MANY = "OneToMany"; //$NON-NLS-1$
+	public static final String ANNOTATION_MANY2ONE = "ManyToOne"; //$NON-NLS-1$
+	public static final String ANNOTATION_MANY2MANY = "ManyToMany"; //$NON-NLS-1$
 	
-	static public Vector<String> ALL_IMPORTS = new Vector<String>();
+	public static final Vector<String> ALL_IMPORTS = new Vector<String>();
 	
 	static {
 		//ALL_IMPORTS.add(IMPORT_SERIALIZABLE);

Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java
===================================================================
---
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java	2009-03-17
19:33:42 UTC (rev 14246)
+++
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java	2009-03-17
19:35:56 UTC (rev 14247)
@@ -42,12 +42,15 @@
  * @author Vitali
  */
 public class AllEntitiesProcessor implements IHibernateJPAWizardParams {
-
 	/**
 	 * place to search compilation units
 	 */
-	protected IJavaProject javaProject;
+	protected IJavaProject javaProject = null;
 	/**
+	 * place to store default settings
+	 */
+	protected IPreferenceStore preferenceStore = null;
+	/**
 	 * annotation style
 	 */
 	protected AnnotStyle annotationStyle = AnnotStyle.FIELDS;
@@ -55,6 +58,11 @@
 	 * annotation style preference of majority
 	 */
 	protected AnnotStyle annotationStylePreference = AnnotStyle.FIELDS;
+	/**
+	 * annotation style preference of majority
+	 */
+	public final static String storePropertyName = 
+		"hibernate.jpa.generation.AnnotationStyle.preference"; //$NON-NLS-1$
 
 	/**
 	 * change info storage
@@ -64,9 +72,20 @@
 	public AllEntitiesProcessor() {
 	}
 
+	public IPreferenceStore getPreferenceStore() {
+		if (preferenceStore == null) {
+			preferenceStore = Activator.getDefault().getPreferenceStore();
+		}
+		return preferenceStore;
+	}
+
+	public void setPreferenceStore(IPreferenceStore preferenceStore) {
+		this.preferenceStore = preferenceStore;
+	}
+
 	public void initAnnotationStylePreference() {
-		IPreferenceStore preferenceStore = Activator.getDefault().getPreferenceStore();
-		int value = preferenceStore.getInt(AllEntitiesProcessor.class.toString());
+		IPreferenceStore preferenceStore = getPreferenceStore();
+		int value = preferenceStore.getInt(storePropertyName);
 		if (value >= AnnotStyle.values().length) {
 			value = 0;
 		}
@@ -74,7 +93,7 @@
 	}
 	
 	public void saveAnnotationStylePreference() {
-		IPreferenceStore preferenceStore = Activator.getDefault().getPreferenceStore();
+		IPreferenceStore preferenceStore = getPreferenceStore();
 		int value = 0;
 		while (value < AnnotStyle.values().length) {
 			if (AnnotStyle.values()[value] == annotationStyle) {
@@ -85,7 +104,7 @@
 		if (value >= AnnotStyle.values().length) {
 			value = 0;
 		}
-		preferenceStore.setValue(AllEntitiesProcessor.class.toString(), value);
+		preferenceStore.setValue(storePropertyName, value);
 	}
 
 	/**


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[jbosstools-commits] JBoss Tools SVN: r14247 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa: collect and 2 other directories.