JBoss Tools SVN: r34105 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui: wizard and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-08-19 18:42:47 -0400 (Fri, 19 Aug 2011)
New Revision: 34105
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizardPage.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
Log:
https://issues.jboss.org/browse/JBIDE-9476
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2011-08-19 22:42:38 UTC (rev 34104)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2011-08-19 22:42:47 UTC (rev 34105)
@@ -44,7 +44,7 @@
private IFile file;
public MakeBeanScopedDependentMarkerResolution(IBean bean, IFile file){
- this.label = MessageFormat.format(CDIUIMessages.MAKE_BEAN_SCOPED_DEPENDENT_MARKER_RESOLUTION_TITLE, new Object[]{bean.getBeanClass().getElementName()});
+ this.label = MessageFormat.format(CDIUIMessages.MAKE_BEAN_SCOPED_DEPENDENT_MARKER_RESOLUTION_TITLE, new Object[]{bean.getSimpleJavaName()});
this.bean = bean;
this.file = file;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2011-08-19 22:42:38 UTC (rev 34104)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2011-08-19 22:42:47 UTC (rev 34105)
@@ -44,7 +44,7 @@
this.injectionPoint = injectionPoint;
this.beans = beans;
this.selectedBean = beans.get(index);
- this.label = MessageFormat.format(CDIUIMessages.MAKE_INJECTED_POINT_UNAMBIGUOUS_TITLE, new Object[]{selectedBean.getBeanClass().getElementName()});
+ this.label = MessageFormat.format(CDIUIMessages.MAKE_INJECTED_POINT_UNAMBIGUOUS_TITLE, new Object[]{selectedBean.getSimpleJavaName()});
}
public String getLabel() {
@@ -104,7 +104,7 @@
ICDIProject cdiProject = selectedBean.getCDIProject();
IBean[] beans = cdiProject.getBeans();
for(IBean bean : beans){
- if(bean.getBeanClass().getFullyQualifiedName().equals(selectedBean.getBeanClass().getFullyQualifiedName())){
+ if(bean.getBeanClass().getFullyQualifiedName().equals(selectedBean.getBeanClass().getFullyQualifiedName()) && bean.getSimpleJavaName().equals(selectedBean.getSimpleJavaName())){
selectedBean = bean;
break;
}
@@ -122,7 +122,7 @@
for(IBean bean: beans){
if(bean.equals(selectedBean))
continue;
- if(AddQualifiersToBeanComposite.checkBeanQualifiers(bean, qualifiers))
+ if(AddQualifiersToBeanComposite.checkBeanQualifiers(selectedBean, bean, qualifiers))
return true;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-08-19 22:42:38 UTC (rev 34104)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-08-19 22:42:47 UTC (rev 34105)
@@ -42,6 +42,8 @@
import org.eclipse.jdt.core.Signature;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IBeanField;
+import org.jboss.tools.cdi.core.IBeanMethod;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
import org.jboss.tools.cdi.core.IInjectionPointMethod;
@@ -424,6 +426,15 @@
public static void addQualifiersToBean(List<IQualifier> deployed, IBean bean){
IFile file = (IFile)bean.getBeanClass().getResource();
+ IJavaElement beanElement = null;
+ if(bean instanceof IBeanField){
+ beanElement = ((IBeanField) bean).getField();
+ }else if(bean instanceof IBeanMethod){
+ beanElement = ((IBeanMethod) bean).getMethod();
+ }else{
+ beanElement = bean.getBeanClass();
+ }
+
try{
ICompilationUnit original = EclipseUtil.getCompilationUnit(file);
ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
@@ -431,7 +442,7 @@
for(IQualifier qualifier : deployed){
String qualifierName = qualifier.getSourceType().getFullyQualifiedName();
if(!qualifierName.equals(CDIConstants.ANY_QUALIFIER_TYPE_NAME) && !qualifierName.equals(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)){
- MarkerResolutionUtils.addAnnotation(qualifier.getSourceType().getFullyQualifiedName(), compilationUnit, bean.getBeanClass());
+ MarkerResolutionUtils.addAnnotation(qualifier.getSourceType().getFullyQualifiedName(), compilationUnit, beanElement);
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2011-08-19 22:42:38 UTC (rev 34104)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2011-08-19 22:42:47 UTC (rev 34105)
@@ -105,7 +105,7 @@
ICDIProject cdiProject = selectedBean.getCDIProject();
IBean[] beans = cdiProject.getBeans();
for(IBean bean : beans){
- if(bean.getBeanClass().getFullyQualifiedName().equals(selectedBean.getBeanClass().getFullyQualifiedName())){
+ if(bean.getBeanClass().getFullyQualifiedName().equals(selectedBean.getBeanClass().getFullyQualifiedName()) && bean.getSimpleJavaName().equals(selectedBean.getSimpleJavaName())){
selectedBean = bean;
break;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizardPage.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizardPage.java 2011-08-19 22:42:38 UTC (rev 34104)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizardPage.java 2011-08-19 22:42:47 UTC (rev 34105)
@@ -18,6 +18,7 @@
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite;
+import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier;
public class AddQualifiersToBeanWizardPage extends WizardPage{
@@ -46,11 +47,11 @@
}
public void deploy(IQualifier qualifier){
- composite.deploy(qualifier);
+ composite.deploy(new ValuedQualifier(qualifier));
}
public void remove(IQualifier qualifier){
- composite.remove(qualifier);
+ composite.remove(new ValuedQualifier(qualifier));
}
public boolean checkBeans(){
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.java 2011-08-19 22:42:38 UTC (rev 34104)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.java 2011-08-19 22:42:47 UTC (rev 34105)
@@ -228,7 +228,7 @@
IBean bean = (IBean)element;
String beanTypeName = bean.getBeanClass().getFullyQualifiedName();
String beanPackage = beanTypeName.substring(0,beanTypeName.lastIndexOf(MarkerResolutionUtils.DOT));
- String name = bean.getBeanClass().getElementName();
+ String name = bean.getSimpleJavaName();
return name+" - "+beanPackage;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-08-19 22:42:38 UTC (rev 34104)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-08-19 22:42:47 UTC (rev 34105)
@@ -73,6 +73,7 @@
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IQualifier;
+import org.jboss.tools.cdi.core.IQualifierDeclaration;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
import org.jboss.tools.cdi.ui.marker.MarkerResolutionUtils;
@@ -88,16 +89,16 @@
private Text pattern;
// original qualifiers on the bean
- private ArrayList<IQualifier> originalQualifiers = new ArrayList<IQualifier>();
+ private ArrayList<ValuedQualifier> originalQualifiers = new ArrayList<ValuedQualifier>();
// qualifiers available to be added to the bean
- private ArrayList<IQualifier> qualifiers = new ArrayList<IQualifier>();
+ private ArrayList<ValuedQualifier> qualifiers = new ArrayList<ValuedQualifier>();
// current qualifiers on the bean
- private ArrayList<IQualifier> deployed = new ArrayList<IQualifier>();
+ private ArrayList<ValuedQualifier> deployed = new ArrayList<ValuedQualifier>();
// original + deployed
- ArrayList<IQualifier> total = new ArrayList<IQualifier>();
+ ArrayList<ValuedQualifier> total = new ArrayList<ValuedQualifier>();
private TableViewer availableTableViewer;
private TableViewer deployedTableViewer;
@@ -107,11 +108,11 @@
private Label nLabel;
- protected boolean isComplete = true;
+ protected boolean isComplete = false;
private boolean hasDefaultQualifier = false;
- private IQualifier defaultQualifier, namedQualifier;
+ private ValuedQualifier defaultQualifier, namedQualifier;
private ILabelProvider labelProvider = new QualifiersListLabelProvider();
@@ -129,12 +130,16 @@
public void init(IBean bean){
this.bean = bean;
- originalQualifiers = new ArrayList<IQualifier>(bean.getQualifiers());
+ originalQualifiers = new ArrayList<ValuedQualifier>();
+ for(IQualifier q : bean.getQualifiers()){
+ String value = findQualifierValue(bean, q);
+ originalQualifiers.add(new ValuedQualifier(q, value));
+ }
- defaultQualifier = bean.getCDIProject().getQualifier(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME);
- namedQualifier = bean.getCDIProject().getQualifier(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
+ defaultQualifier = new ValuedQualifier(bean.getCDIProject().getQualifier(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME));
+ namedQualifier = new ValuedQualifier(bean.getCDIProject().getQualifier(CDIConstants.NAMED_QUALIFIER_TYPE_NAME));
- for(IQualifier q : originalQualifiers){
+ for(ValuedQualifier q : originalQualifiers){
if(q.equals(defaultQualifier)){
hasDefaultQualifier = true;
break;
@@ -149,12 +154,12 @@
availableTableViewer.setInput(qualifiers);
if(nLabel != null)
nLabel.setText(MessageFormat.format(CDIUIMessages.ADD_QUALIFIERS_TO_BEAN_WIZARD_MESSAGE,
- new Object[]{bean.getBeanClass().getElementName()}));
+ new Object[]{bean.getSimpleJavaName()}));
refresh();
}
- private IQualifier loadAvailableQualifiers(){
- IQualifier lastQualifier = null;
+ private ValuedQualifier loadAvailableQualifiers(){
+ ValuedQualifier lastQualifier = null;
String beanTypeName = bean.getBeanClass().getFullyQualifiedName();
String beanPackage = beanTypeName.substring(0,beanTypeName.lastIndexOf(MarkerResolutionUtils.DOT));
@@ -166,7 +171,8 @@
IQualifier[] qs = bean.getCDIProject().getQualifiers();
for(IQualifier q : qs){
- if(!contains(originalQualifiers, q) && !contains(qualifiers, q) && !contains(deployed, q)){
+ ValuedQualifier vq = new ValuedQualifier(q);
+ if(!contains(originalQualifiers, vq) && !contains(qualifiers, vq) && !contains(deployed, vq)){
boolean isPublic = true;
try{
isPublic = Flags.isPublic(q.getSourceType().getFlags());
@@ -176,19 +182,17 @@
String qualifierTypeName = q.getSourceType().getFullyQualifiedName();
String qualifierPackage = qualifierTypeName.substring(0,qualifierTypeName.lastIndexOf(MarkerResolutionUtils.DOT));
if((isPublic || (samePackage && injectionPointPackage.equals(qualifierPackage))) ){
- qualifiers.add(q);
- lastQualifier = q;
+ qualifiers.add(vq);
+ lastQualifier = vq;
}
}
}
return lastQualifier;
}
- private boolean contains(ArrayList<IQualifier> qualifiers, IQualifier qualifier){
- String qualifierText = labelProvider.getText(qualifier);
- for(IQualifier q : qualifiers){
- String qText = labelProvider.getText(q);
- if(qText.equals(qualifierText))
+ private boolean contains(ArrayList<ValuedQualifier> qualifiers, ValuedQualifier qualifier){
+ for(ValuedQualifier q : qualifiers){
+ if(q.equals(qualifier))
return true;
}
return false;
@@ -217,21 +221,29 @@
total.clear();
total.addAll(originalQualifiers);
total.addAll(deployed);
- HashSet<IQualifier> qfs = new HashSet<IQualifier>(total);
+ HashSet<ValuedQualifier> qfs = new HashSet<ValuedQualifier>(total);
for(IBean b: beans){
if(b.equals(bean))
continue;
- if(checkBeanQualifiers(b, qfs))
+ if(checkValuedQualifiers(bean, b, qfs))
return false;
}
return true;
}
- public static boolean checkBeanQualifiers(IBean bean, Set<IQualifier> qualifiers){
+ public static boolean checkBeanQualifiers(IBean selectedBean, IBean bean, Set<IQualifier> qualifiers){
+ HashSet<ValuedQualifier> valuedQualifiers = new HashSet<ValuedQualifier>();
for(IQualifier qualifier : qualifiers){
- if(!isBeanContainQualifier(bean.getQualifiers(), qualifier)){
+ valuedQualifiers.add(new ValuedQualifier(qualifier));
+ }
+ return checkValuedQualifiers(selectedBean, bean, valuedQualifiers);
+ }
+
+ private static boolean checkValuedQualifiers(IBean selectedBean, IBean bean, Set<ValuedQualifier> qualifiers){
+ for(ValuedQualifier qualifier : qualifiers){
+ if(!isBeanContainQualifier(bean, qualifier)){
return false;
}
}
@@ -240,13 +252,40 @@
return false;
}
- public static boolean isBeanContainQualifier(Set<IQualifier> qualifiers, IQualifier qualifier){
+ private static boolean isBeanContainQualifier(IBean bean, ValuedQualifier valuedQualifier){
+
+ Set<IQualifier> qualifiers = bean.getQualifiers();
for(IQualifier q : qualifiers){
- if(q.getSourceType().getFullyQualifiedName().equals(qualifier.getSourceType().getFullyQualifiedName()))
+ String value = findQualifierValue(bean, q);
+ if(q.getSourceType().getFullyQualifiedName().equals(valuedQualifier.getQualifier().getSourceType().getFullyQualifiedName()) &&
+ value.equals(valuedQualifier.getValue()))
return true;
}
return false;
}
+
+ private static String findQualifierValue(IBean bean, IQualifier qualifier){
+ IQualifierDeclaration declaration = findQualifierDeclaration(bean, qualifier);
+ if(declaration == null)
+ return "";
+
+ Object value = declaration.getMemberValue(null);
+
+ return value == null ? "" : value.toString();
+ }
+
+ private static IQualifierDeclaration findQualifierDeclaration(IBean bean, IQualifier qualifier){
+ Set<IQualifierDeclaration> declarations = bean.getQualifierDeclarations();
+
+ if(declarations == null)
+ return null;
+
+ for(IQualifierDeclaration declaration : declarations){
+ if(declaration.getQualifier().getSourceType().getFullyQualifiedName().equals(qualifier.getSourceType().getFullyQualifiedName()))
+ return declaration;
+ }
+ return null;
+ }
protected void createControl() {
@@ -275,7 +314,7 @@
nLabel.setLayoutData(data);
if(bean != null)
nLabel.setText(MessageFormat.format(CDIUIMessages.ADD_QUALIFIERS_TO_BEAN_WIZARD_MESSAGE,
- new Object[]{bean.getBeanClass().getElementName()}));
+ new Object[]{bean.getSimpleJavaName()}));
Label label = new Label(this, SWT.NONE);
label.setText(CDIUIMessages.ADD_QUALIFIERS_TO_BEAN_WIZARD_ENTER_QUALIFIER_NAME);
@@ -472,10 +511,10 @@
}
}
- IQualifier q = loadAvailableQualifiers();
+ ValuedQualifier q = loadAvailableQualifiers();
if(q != null){
- moveAll(new IQualifier[]{q}, true);
+ moveAll(new ValuedQualifier[]{q}, true);
}
}
}
@@ -486,22 +525,22 @@
Dialog.applyDialogFont(this);
}
- protected IQualifier[] getAvailableSelection() {
+ protected ValuedQualifier[] getAvailableSelection() {
IStructuredSelection sel = (IStructuredSelection) availableTableViewer.getSelection();
if (sel.isEmpty())
- return new IQualifier[0];
+ return new ValuedQualifier[0];
- IQualifier[] mss = new IQualifier[sel.size()];
+ ValuedQualifier[] mss = new ValuedQualifier[sel.size()];
System.arraycopy(sel.toArray(), 0, mss, 0, sel.size());
return mss;
}
- protected IQualifier[] getDeployedSelection() {
+ protected ValuedQualifier[] getDeployedSelection() {
IStructuredSelection sel = (IStructuredSelection) deployedTableViewer.getSelection();
if (sel.isEmpty())
- return new IQualifier[0];
+ return new ValuedQualifier[0];
- IQualifier[] mss = new IQualifier[sel.size()];
+ ValuedQualifier[] mss = new ValuedQualifier[sel.size()];
System.arraycopy(sel.toArray(), 0, mss, 0, sel.size());
return mss;
}
@@ -509,13 +548,13 @@
protected void setEnablement() {
isComplete = true;
- IQualifier[] ms = getAvailableSelection();
+ ValuedQualifier[] ms = getAvailableSelection();
if (ms == null || ms.length == 0) {
add.setEnabled(false);
} else {
boolean enabled = false;
for (int i = 0; i < ms.length; i++) {
- IQualifier qualifier = ms[i];
+ ValuedQualifier qualifier = ms[i];
if (qualifier != null) {
if (contains(qualifiers, qualifier)) {
enabled = true;
@@ -535,7 +574,7 @@
} else {
boolean enabled = false;
for (int i = 0; i < ms.length; i++) {
- IQualifier qualifier = ms[i];
+ ValuedQualifier qualifier = ms[i];
if (qualifier != null && contains(deployed, qualifier)) {
enabled = true;
}
@@ -561,7 +600,7 @@
protected void add(boolean all) {
if (all) {
- IQualifier[] qualifiers2 = new IQualifier[qualifiers.size()];
+ ValuedQualifier[] qualifiers2 = new ValuedQualifier[qualifiers.size()];
qualifiers.toArray(qualifiers2);
moveAll(qualifiers2, true);
} else
@@ -570,10 +609,10 @@
protected void remove(boolean all) {
if (all) {
- ArrayList<IQualifier> list = new ArrayList<IQualifier>();
+ ArrayList<ValuedQualifier> list = new ArrayList<ValuedQualifier>();
list.addAll(deployed);
- IQualifier[] qualifiers2 = new IQualifier[list.size()];
+ ValuedQualifier[] qualifiers2 = new ValuedQualifier[list.size()];
list.toArray(qualifiers2);
moveAll(qualifiers2, false);
@@ -581,9 +620,9 @@
moveAll(getDeployedSelection(), false);
}
- protected void moveAll(IQualifier[] mods, boolean add2) {
+ protected void moveAll(ValuedQualifier[] mods, boolean add2) {
int size = mods.length;
- ArrayList<IQualifier> list = new ArrayList<IQualifier>();
+ ArrayList<ValuedQualifier> list = new ArrayList<ValuedQualifier>();
for (int i = 0; i < size; i++) {
if (!contains(list, mods[i]))
list.add(mods[i]);
@@ -591,7 +630,7 @@
Iterator iterator = list.iterator();
while (iterator.hasNext()) {
- IQualifier qualifier = (IQualifier) iterator.next();
+ ValuedQualifier qualifier = (ValuedQualifier) iterator.next();
if (add2) {
qualifiers.remove(qualifier);
deployed.add(qualifier);
@@ -623,22 +662,22 @@
}
- public ArrayList<IQualifier> getQualifiersToRemove() {
- ArrayList<IQualifier> list = new ArrayList<IQualifier>();
+ public ArrayList<ValuedQualifier> getQualifiersToRemove() {
+ ArrayList<ValuedQualifier> list = new ArrayList<ValuedQualifier>();
Iterator iterator = originalQualifiers.iterator();
while (iterator.hasNext()) {
- IQualifier qualifier = (IQualifier) iterator.next();
+ ValuedQualifier qualifier = (ValuedQualifier) iterator.next();
if (!contains(deployed, qualifier))
list.add(qualifier);
}
return list;
}
- public ArrayList<IQualifier> getQualifiersToAdd() {
- ArrayList<IQualifier> list = new ArrayList<IQualifier>();
+ public ArrayList<ValuedQualifier> getQualifiersToAdd() {
+ ArrayList<ValuedQualifier> list = new ArrayList<ValuedQualifier>();
Iterator iterator = deployed.iterator();
while (iterator.hasNext()) {
- IQualifier qualifier = (IQualifier) iterator.next();
+ ValuedQualifier qualifier = (ValuedQualifier) iterator.next();
if (!contains(originalQualifiers, qualifier))
list.add(qualifier);
}
@@ -653,22 +692,37 @@
total.clear();
total.addAll(originalQualifiers);
total.addAll(deployed);
+
+ ArrayList<IQualifier> result = new ArrayList<IQualifier>();
+
+ for(ValuedQualifier vq : total){
+ result.add(vq.qualifier);
+ }
- return total;
+ return result;
}
- public void deploy(IQualifier qualifier){
- IQualifier[] qualifiers = new IQualifier[]{qualifier};
+ public void deploy(ValuedQualifier qualifier){
+ ValuedQualifier[] qualifiers = new ValuedQualifier[]{qualifier};
moveAll(qualifiers, true);
}
- public void remove(IQualifier qualifier){
- IQualifier[] qualifiers = new IQualifier[]{qualifier};
+ public void remove(ValuedQualifier qualifier){
+ ValuedQualifier[] qualifiers = new ValuedQualifier[]{qualifier};
moveAll(qualifiers, false);
}
+// public ArrayList<ValuedQualifier> getAvailableValuedQualifiers(){
+// return qualifiers;
+// }
+
public ArrayList<IQualifier> getAvailableQualifiers(){
- return qualifiers;
+ ArrayList<IQualifier> result = new ArrayList<IQualifier>();
+ for(ValuedQualifier vq : qualifiers){
+ result.add(vq.getQualifier());
+ }
+
+ return result;
}
class QualifiersListLabelProvider implements ILabelProvider, IColorProvider{
@@ -691,11 +745,11 @@
}
public String getText(Object element) {
- if(element instanceof IQualifier){
- IQualifier qualifier = (IQualifier)element;
- String qualifierTypeName = qualifier.getSourceType().getFullyQualifiedName();
+ if(element instanceof ValuedQualifier){
+ ValuedQualifier vq = (ValuedQualifier)element;
+ String qualifierTypeName = vq.getQualifier().getSourceType().getFullyQualifiedName();
String qualifierPackage = qualifierTypeName.substring(0,qualifierTypeName.lastIndexOf(MarkerResolutionUtils.DOT));
- String name = qualifier.getSourceType().getElementName();
+ String name = vq.getQualifier().getSourceType().getElementName();
return name+" - "+qualifierPackage;
}
@@ -703,8 +757,8 @@
}
public Color getForeground(Object element) {
- if(element instanceof IQualifier){
- if(contains(originalQualifiers, (IQualifier)element))
+ if(element instanceof ValuedQualifier){
+ if(contains(originalQualifiers, (ValuedQualifier)element))
return ColorConstants.lightGray;
}
return ColorConstants.black;
@@ -741,8 +795,8 @@
public boolean select(Viewer viewer, Object parentElement,
Object element) {
- if (element instanceof IQualifier) {
- String qualifierTypeName = ((IQualifier)element).getSourceType().getFullyQualifiedName();
+ if (element instanceof ValuedQualifier) {
+ String qualifierTypeName = ((ValuedQualifier)element).getQualifier().getSourceType().getFullyQualifiedName();
if(pattern.getText().isEmpty())
patternMatcher.setPattern("*");
else
@@ -762,5 +816,33 @@
return false;
}
}
+
+ public static class ValuedQualifier{
+ private IQualifier qualifier;
+ private String value="";
+
+ public ValuedQualifier(IQualifier qualifier){
+ this.qualifier = qualifier;
+ }
+
+ public ValuedQualifier(IQualifier qualifier, String value){
+ this(qualifier);
+ this.value = value;
+ }
+
+ public IQualifier getQualifier(){
+ return qualifier;
+ }
+
+ public String getValue(){
+ return value;
+ }
+ public boolean equals(Object obj) {
+ if(obj instanceof ValuedQualifier)
+ return getQualifier().getSourceType().getFullyQualifiedName().equals(((ValuedQualifier)obj).getQualifier().getSourceType().getFullyQualifiedName());
+ return false;
+ }
+ }
+
}
\ No newline at end of file
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34104 - in trunk/vpe: plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-19 18:42:38 -0400 (Fri, 19 Aug 2011)
New Revision: 34104
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/model/PaletteCategory.java
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/VpeResizerMouseMotionListener.java
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java
trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlTestPlugin.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java
Log:
code cleanup:
1. Null checks removed where possible
2. Code style and complexity fixes
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2011-08-19 22:40:34 UTC (rev 34103)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2011-08-19 22:42:38 UTC (rev 34104)
@@ -662,7 +662,7 @@
sourceChangeFlag = true;
int type = ((Node) notifier).getNodeType();
visualEditor.hideResizer();
- visualBuilder.setSelectionRectangle(null);
+ visualBuilder.setSelectionRectangle(SelectionManager.EMPTY_SELECTION);
if (type == Node.CDATA_SECTION_NODE) {
visualBuilder.setCdataText((Node) notifier);
} else if (type == Node.TEXT_NODE) {
@@ -1599,7 +1599,7 @@
visualEditor.reload();
} else {
// Fix bugs JBIDE-2750
- visualBuilder.setSelectionRectangle(null);
+ visualBuilder.setSelectionRectangle(SelectionManager.EMPTY_SELECTION);
visualEditor.reload();
// IDOMModel sourceModel = (IDOMModel) getModel();
// if (sourceModel != null) {
@@ -1702,15 +1702,12 @@
}
public boolean startActiveEditor(int newType) {
- if (type == ACTIVE_EDITOR_NONE) {
- if (newType == ACTIVE_EDITOR_SOURCE
- && editPart.getVisualMode() == VpeEditorPart.SOURCE_MODE) {
- return false;
- }
+ if (type != ACTIVE_EDITOR_NONE || type == ACTIVE_EDITOR_NONE && newType == ACTIVE_EDITOR_SOURCE
+ && editPart.getVisualMode() == VpeEditorPart.SOURCE_MODE) {
+ return false;
+ } else {
type = newType;
return true;
- } else {
- return false;
}
}
@@ -2442,7 +2439,7 @@
// node is created, see JBIDE-5105
visualEditor.reinitDesignMode();
- visualBuilder.setSelectionRectangle(null);
+ visualBuilder.setSelectionRectangle(SelectionManager.EMPTY_SELECTION);
IDOMModel sourceModel = (IDOMModel) getModel();
if (sourceModel != null) {
IDOMDocument sourceDocument = sourceModel.getDocument();
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2011-08-19 22:40:34 UTC (rev 34103)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2011-08-19 22:42:38 UTC (rev 34104)
@@ -1078,7 +1078,7 @@
public void setSelectionRectangle(/* nsIDOMElement */List<nsIDOMNode> visualNodes) {
int resizerConstrains = VpeTagDescription.RESIZE_CONSTRAINS_NONE;
- if(visualNodes!=null&&visualNodes.size()==1){
+ if(visualNodes.size()==1){
resizerConstrains = getResizerConstrains(visualNodes.get(0));
}
visualEditor.setSelectionRectangle(visualNodes, resizerConstrains);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java 2011-08-19 22:40:34 UTC (rev 34103)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java 2011-08-19 22:42:38 UTC (rev 34104)
@@ -12,6 +12,7 @@
package org.jboss.tools.vpe.editor.template;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.eclipse.swt.graphics.Point;
@@ -38,7 +39,8 @@
*
*/
public class SelectionManager implements ISelectionManager {
-
+
+ public static final List<nsIDOMNode> EMPTY_SELECTION = Collections.unmodifiableList(new ArrayList<nsIDOMNode>(0));
/**
* pageContext keeps information about page
*/
@@ -179,8 +181,7 @@
targetVisualNodes.add(nodeMapping.getVisualNode());
}
}
- getPageContext().getVisualBuilder().setSelectionRectangle(
- targetVisualNodes);
+ getPageContext().getVisualBuilder().setSelectionRectangle(targetVisualNodes);
}
/**
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2011-08-19 22:40:34 UTC (rev 34103)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2011-08-19 22:42:38 UTC (rev 34104)
@@ -26,8 +26,8 @@
import org.jboss.tools.jst.jsp.util.NodesManagingUtil;
import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.dnd.VpeDnDHelper;
-import org.jboss.tools.vpe.editor.VpeSourceInnerDragInfo;
import org.jboss.tools.vpe.editor.VpeSourceDropInfo;
+import org.jboss.tools.vpe.editor.VpeSourceInnerDragInfo;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.mapping.NodeData;
import org.jboss.tools.vpe.editor.mapping.VpeDomMapping;
@@ -37,8 +37,6 @@
import org.jboss.tools.vpe.editor.template.resize.VpeResizer;
import org.jboss.tools.vpe.editor.template.textformating.TextFormatingData;
import org.jboss.tools.vpe.editor.util.Constants;
-import org.jboss.tools.vpe.editor.util.SelectionUtil;
-import org.jboss.tools.vpe.editor.util.VpeNodesManagingUtil;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNode;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java 2011-08-19 22:40:34 UTC (rev 34103)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java 2011-08-19 22:42:38 UTC (rev 34104)
@@ -14,8 +14,8 @@
import org.eclipse.swt.graphics.Point;
import org.jboss.tools.jst.jsp.editor.ITextFormatter;
import org.jboss.tools.jst.jsp.selection.SourceSelection;
+import org.jboss.tools.vpe.editor.VpeSourceDropInfo;
import org.jboss.tools.vpe.editor.VpeSourceInnerDragInfo;
-import org.jboss.tools.vpe.editor.VpeSourceDropInfo;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.mapping.NodeData;
import org.jboss.tools.vpe.editor.mapping.VpeDomMapping;
@@ -430,9 +430,9 @@
boolean containsText();
- public boolean canModify();
+ boolean canModify();
- public void setModify(boolean modify);
+ void setModify(boolean modify);
/**
*
@@ -441,7 +441,7 @@
* @param domMapping
* @return
*/
- public NodeData getNodeData(nsIDOMNode node, VpeElementData elementData,
+ NodeData getNodeData(nsIDOMNode node, VpeElementData elementData,
VpeDomMapping domMapping);
/**
@@ -451,11 +451,11 @@
* @param domMapping
* @return
*/
- public nsIDOMNode getVisualNodeBySourcePosition(
+ nsIDOMNode getVisualNodeBySourcePosition(
VpeElementMapping elementMapping,
Point selectionRange, VpeDomMapping domMapping);
- public boolean isInvisible();
+ boolean isInvisible();
/**
* Calculates and returns sourceRegion, on which we should
@@ -464,10 +464,18 @@
* @param domNode
* @return sourceRegion on which we should make openOn action
*/
- public IRegion getSourceRegionForOpenOn(VpePageContext pageContext, Node sourceNode,nsIDOMNode domNode);
+ IRegion getSourceRegionForOpenOn(VpePageContext pageContext, Node sourceNode,nsIDOMNode domNode);
- public double getPriority();
+ /**
+ *
+ * @return
+ */
+ double getPriority();
- public void setPriority(double priority);
-
+ /**
+ *
+ * @param priority
+ */
+ void setPriority(double priority);
+
}
\ No newline at end of file
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java 2011-08-19 22:40:34 UTC (rev 34103)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java 2011-08-19 22:42:38 UTC (rev 34104)
@@ -41,8 +41,8 @@
VpeTemplate getTemplate(VpePageContext pageContext, Node sourceNode, Set ifDependencySet) {
VpeTemplate result = defTemplate;
boolean initializeCustomTemplate = true;
- for (int i = 0; i < templates.size(); i++) {
- VpeTemplateSet set = (VpeTemplateSet)templates.get(i);
+
+ for (VpeTemplateSet set : templates) {
VpeTemplate template = set.getTemplate(pageContext, sourceNode, ifDependencySet);
if (template != null) {
if (result == null) {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/model/PaletteCategory.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/model/PaletteCategory.java 2011-08-19 22:40:34 UTC (rev 34103)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/model/PaletteCategory.java 2011-08-19 22:42:38 UTC (rev 34104)
@@ -21,8 +21,6 @@
public class PaletteCategory extends PaletteDrawer implements PaletteXModelObject {
private XModelObject xobject;
-/// private String[] natureTypes;
-/// private String[] editorTypes;
public PaletteCategory(XModelObject xobject, boolean open) {
super(null);
@@ -47,32 +45,6 @@
p = p.getParent();
}
setLabel(label);
-/// natureTypes = getTypes("nature type");
-/// editorTypes = getTypes("editor type");
}
-/*
- public String[] getNatureTypes() {
- return natureTypes;
- }
-
- public String[] getEditorTypes() {
- return editorTypes;
- }
-*/
- private String[] getTypes(String name) {
- String attr = xobject.getAttributeValue(name);
- if (attr == null) {
- return null;
- }
- StringTokenizer st = new StringTokenizer(attr, ";"); //$NON-NLS-1$
- List attrs = new ArrayList();
- while (st.hasMoreTokens()) {
- attrs.add(st.nextToken());
- }
- if (attrs.size() <= 0) {
- return null;
- }
- return (String[])attrs.toArray(new String[attrs.size()]);
- }
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/VpeResizerMouseMotionListener.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/VpeResizerMouseMotionListener.java 2011-08-19 22:40:34 UTC (rev 34103)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/VpeResizerMouseMotionListener.java 2011-08-19 22:42:38 UTC (rev 34104)
@@ -40,14 +40,12 @@
public void mouseMove(nsIDOMEvent event) {
nsIDOMMouseEvent mouseEvent = XPCOM.queryInterface(event, nsIDOMMouseEvent.class);
- if ( mouseEvent == null ) {
- return;
+ if ( mouseEvent != null ) {
+ vpeResizer.mouseMove(mouseEvent);
}
- vpeResizer.mouseMove(mouseEvent);
}
public void dragMove(nsIDOMEvent event) {
-
}
public void handleEvent(nsIDOMEvent event) {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2011-08-19 22:40:34 UTC (rev 34103)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2011-08-19 22:42:38 UTC (rev 34104)
@@ -267,26 +267,23 @@
* @param scroll
*/
public void setSelectionRectangle(List<nsIDOMNode> nodes, int resizerConstrains) {
- if (getFlasher() == null) {
- return;
- }
+ getFlasher();
this.selectedNodes = nodes;
- nsIDOMElement element = getSelectedElement();
- if (element != null) {
- repaint();
- scrollToElement(element);
- }
- redrawSelectionRectangle();
+ nsIDOMElement element = getSelectedElement();
+ if (element != null) {
+ repaint();
+ scrollToElement(element);
+ }
+ redrawSelectionRectangle();
- if (xulRunnerVpeResizer != null) {
- if (element != null && resizerConstrains != 0) {
- xulRunnerVpeResizer.show(element, resizerConstrains);
- } else {
- xulRunnerVpeResizer.hide();
- }
+ if (xulRunnerVpeResizer != null) {
+ if (element != null && resizerConstrains != 0) {
+ xulRunnerVpeResizer.show(element, resizerConstrains);
+ } else {
+ xulRunnerVpeResizer.hide();
}
-
+ }
lastResizerConstrains = resizerConstrains;
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlTestPlugin.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlTestPlugin.java 2011-08-19 22:40:34 UTC (rev 34103)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlTestPlugin.java 2011-08-19 22:42:38 UTC (rev 34104)
@@ -64,16 +64,4 @@
return plugin;
}
- public static String getPluginResourcePath() {
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- URL url = null;
- try {
- url = bundle == null ? null : FileLocator.resolve(bundle
- .getEntry("/resources")); // $NON-NLS-1$
- } catch (Exception e) {
- url = bundle.getEntry("/resources"); // $NON-NLS-1$
- }
- return (url == null) ? null : url.getPath();
- }
-
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java 2011-08-19 22:40:34 UTC (rev 34103)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java 2011-08-19 22:42:38 UTC (rev 34104)
@@ -96,7 +96,7 @@
public IProject getProject(String projectName) throws IOException {
IProject project = getExistingProject(projectName);
- if (project == null) {
+ if (!project.isAccessible()) {
ProjectLocation location = projectNameToLocation.get(projectName);
if (location == null) {
throw new RuntimeException(
@@ -115,10 +115,6 @@
throw new RuntimeException("Project by the path='" + location.getPath()
+ "' cannot be imported.",e);
}
- if (project == null) {
- throw new RuntimeException("Project by the path='" + location.getPath()
- + "' cannot be imported.");
- }
}
return project;
@@ -129,13 +125,8 @@
* if there is no project with this name in the workspace.
*/
public static IProject getExistingProject(String projectName) {
- IProject project = ResourcesPlugin.getWorkspace().getRoot()
+ return ResourcesPlugin.getWorkspace().getRoot()
.getProject(projectName);
- if (project.isAccessible()) {
- return project;
- } else {
- return null;
- }
}
/**
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34103 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-19 18:40:34 -0400 (Fri, 19 Aug 2011)
New Revision: 34103
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java
Log:
JBIDE-9527
https://issues.jboss.org/browse/JBIDE-9527
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java 2011-08-19 22:38:56 UTC (rev 34102)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java 2011-08-19 22:40:34 UTC (rev 34103)
@@ -21,7 +21,6 @@
import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IWindowListener;
import org.eclipse.ui.IWorkbenchWindow;
@@ -33,7 +32,6 @@
import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.jst.web.kb.internal.KbBuilderMarker;
import org.jboss.tools.jst.web.kb.internal.KbProject;
-import org.jboss.tools.jst.web.project.WebProject;
/**
*
@@ -52,7 +50,6 @@
public static final QualifiedName IS_JSF_CHECK_NEED = new QualifiedName(
"", JsfUIMessages.IS_JSF_CHECK_NEED); //$NON-NLS-1$
private Set<IProject> projectsCollection;
- private static final String STRUTS_NATURE_ID = "org.jboss.tools.struts.strutsnature"; //$NON-NLS-1$
private static ProjectNaturesChecker checker;
@@ -89,15 +86,8 @@
public void checkNatures(IProject project) throws CoreException {
if (project != null && project.isAccessible()) {
addProject(project);
- boolean isJSFCheck = true;
- boolean isJSFNaturesCheck = true;
- boolean isKBNaturesCheck = true;
updateProjectPersistentProperties(project);
- isJSFCheck = Boolean.parseBoolean(project
- .getPersistentProperty(IS_JSF_CHECK_NEED));
- isJSFNaturesCheck = Boolean.parseBoolean(project
- .getPersistentProperty(IS_JSF_NATURES_CHECK_NEED));
- isKBNaturesCheck = Boolean.parseBoolean(project
+ boolean isKBNaturesCheck = Boolean.parseBoolean(project
.getPersistentProperty(IS_KB_NATURES_CHECK_NEED));
KbProject.checkKBBuilderInstalled(project);
String missingNature = checkMissingNatures(project);
@@ -105,9 +95,6 @@
ProjectNaturesInfoDialog dialog = null;
if (KbProject.NATURE_ID.equals(missingNature) && isKBNaturesCheck) {
dialog = new KBNaturesInfoDialog(project);
- } else if (WebProject.JSF_NATURE_ID.equals(missingNature)
- && isJSFNaturesCheck && isJSFCheck) {
- dialog = new JSFNaturesInfoDialog(project);
}
if (dialog != null) {
dialog.open();
@@ -117,12 +104,6 @@
}
private String checkMissingNatures(IProject project) throws CoreException {
- if (project.getNature(STRUTS_NATURE_ID) != null) {
- return null;
- }
- if (project.getNature(WebProject.JSF_NATURE_ID) == null) {
- return WebProject.JSF_NATURE_ID;
- }
if (getKBProblemMarker(project) != null) {
return IKbProject.NATURE_ID;
}
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34102 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-19 18:38:56 -0400 (Fri, 19 Aug 2011)
New Revision: 34102
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSFNaturesInfoDialog_JBIDE5701.java
Log:
JBIDE-9527
https://issues.jboss.org/browse/JBIDE-9527
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSFNaturesInfoDialog_JBIDE5701.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSFNaturesInfoDialog_JBIDE5701.java 2011-08-19 19:11:35 UTC (rev 34101)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSFNaturesInfoDialog_JBIDE5701.java 2011-08-19 22:38:56 UTC (rev 34102)
@@ -12,6 +12,7 @@
package org.jboss.tools.jsf.ui.test;
/**
+ * On fixing JBIDE-9427, this case suggests adding KB nature instead of JSF nature.
*
* @author yzhishko
*
@@ -20,11 +21,8 @@
public class JSFNaturesInfoDialog_JBIDE5701 extends NaturesInfoDialogTest {
private static final String testProjectName = "naturesCheckTest"; //$NON-NLS-1$
- private static final String TEST_STRING = "JBoss Tools Editor might not fully work in project \"" //$NON-NLS-1$
- + testProjectName +
- "\" because it does not have JSF and code completion enabled completely.\n\n" + //$NON-NLS-1$
- "Please use the Configure menu on the project or \"Add JSF Capabilities...\" fix button to enable JSF if " + //$NON-NLS-1$
- "you want all features of the editor working."; //$NON-NLS-1$
+ private static final String TEST_STRING = "The project \"" + testProjectName + "\" does not have JSF code completion and validation enabled completely."
+ + "\n\nPlease use \"Enable JSF Code Completion...\" fix button if you want these features working.";
public JSFNaturesInfoDialog_JBIDE5701(String name) {
super(name);
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34101 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-19 15:11:35 -0400 (Fri, 19 Aug 2011)
New Revision: 34101
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/ServerSourcePathComputerDelegate.java
Log:
cleaned code a little, because I was reviewing it anyway.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/ServerSourcePathComputerDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/ServerSourcePathComputerDelegate.java 2011-08-19 19:10:14 UTC (rev 34100)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/ServerSourcePathComputerDelegate.java 2011-08-19 19:11:35 UTC (rev 34101)
@@ -75,14 +75,11 @@
private void processModules(List<FolderSourceContainer> sourcefolderList, IModule[] modules, List<IJavaProject> javaProjectList, IServer server, IProgressMonitor monitor) {
for (int i = 0; i < modules.length; i++) {
- IProject project = modules[i].getProject();
- IModule[] pModule = new IModule[1];
- pModule[0]=modules[i];
- IModule[] cModule = server.getChildModules(pModule, monitor);
- if(cModule != null && cModule.length>0)
- {
+ IModule[] cModule = server.getChildModules(new IModule[] {modules[i]}, monitor);
+ if (cModule != null && cModule.length>0) {
processModules(sourcefolderList, cModule, javaProjectList, server, monitor);
}
+ IProject project = modules[i].getProject();
if (project != null && project.isAccessible()) {
IFolder moduleFolder = project.getFolder(modules[i].getName());
if (moduleFolder.exists()) {
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34100 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-19 15:10:14 -0400 (Fri, 19 Aug 2011)
New Revision: 34100
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java
Log:
disabled validation framework for as tests, it reduce waiting time twice and doesn't affect test results.
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2011-08-19 19:05:19 UTC (rev 34099)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2011-08-19 19:10:14 UTC (rev 34100)
@@ -24,6 +24,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.eclipse.wst.validation.ValidationFramework;
import org.jboss.ide.eclipse.as.test.classpath.JBIDE1657Test;
import org.jboss.ide.eclipse.as.test.classpath.JEEClasspathContainerTest;
import org.jboss.ide.eclipse.as.test.classpath.ProjectRuntimeTest;
@@ -43,6 +44,7 @@
public class ASTestSuite extends TestSuite {
public static Test suite() {
+ ValidationFramework.getDefault().suspendAllValidation(true);
TestSuite suite = new TestSuite("ASTools Test Suite");
suite.addTestSuite(PreReqTest.class);
suite.addTestSuite(RuntimeServerModelTest.class);
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34099 - trunk/as/tests/org.jboss.ide.eclipse.as.egit.test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-19 15:05:19 -0400 (Fri, 19 Aug 2011)
New Revision: 34099
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/.project
Log:
[JBIDE-9513] corrected erroneous project name
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/.project
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/.project 2011-08-19 19:02:53 UTC (rev 34098)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/.project 2011-08-19 19:05:19 UTC (rev 34099)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.ide.eclipse.as.egit.internal.test</name>
+ <name>org.jboss.ide.eclipse.as.egit.test</name>
<comment></comment>
<projects>
</projects>
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34098 - trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-19 15:02:53 -0400 (Fri, 19 Aug 2011)
New Revision: 34098
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java
Log:
[JBIDE-9513] pushtest finally implemented and running successfully!
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java 2011-08-19 18:52:57 UTC (rev 34097)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java 2011-08-19 19:02:53 UTC (rev 34098)
@@ -135,25 +135,28 @@
EGitUtils.commit(testProject.getProject(), null);
- testUtils.assertRepositoryContainsFiles(testRepository.getRepository(),
+ testUtils.assertRepositoryContainsFiles(
+ testRepository.getRepository(),
new String[] { testUtils.getRepositoryPath(file) });
}
@Test
- public void canPushRepoToAntoherRepo() throws Exception {
+ public void fileAddedToCloneIsInOriginAfterPush() throws Exception {
+ String fileName = "b.txt";
+ String fileContent = "adietish(a)redhat.com";
+ Repository clonedRepository = clonedTestRepository.getRepository();
+ newRepositoryFile(fileName, fileContent, clonedRepository);
+ Git git = new Git(clonedRepository);
+ git.add().addFilepattern(fileName).call();
+ git.commit().setCommitter(GIT_USER, GIT_EMAIL).setMessage("adding a new file").call();
- newRepositoryFile("b.txt", "9876", clonedTestRepository.getRepository());
- new Git(clonedTestRepository.getRepository())
- .add().addFilepattern("b.txt").call();
- new Git(clonedTestRepository.getRepository())
- .commit().setCommitter(GIT_USER, GIT_EMAIL).setMessage("commit").call();
+ EGitUtils.push(clonedRepository, null);
- EGitUtils.push(clonedTestRepository.getRepository(), null);
-
+ // does origin contain file added to clone?
testUtils.assertRepositoryContainsFilesWithContent(
- testRepository.getRepository(),
- "b.txt",
- "9876");
+ clonedRepository,
+ fileName,
+ fileContent);
}
private void addToRepository(IFile file, TestRepository testRepository) throws IOException, CoreException {
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34097 - trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-19 14:52:57 -0400 (Fri, 19 Aug 2011)
New Revision: 34097
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java
Log:
[JBIDE-9513] pushtest finally implemented and running successfully!
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java 2011-08-19 16:22:55 UTC (rev 34096)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java 2011-08-19 18:52:57 UTC (rev 34097)
@@ -1,8 +1,10 @@
package org.jboss.ide.eclipse.as.egit.internal.test;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
import java.lang.reflect.InvocationTargetException;
import java.net.URISyntaxException;
@@ -42,8 +44,6 @@
private TestProject testProject;
private TestRepository clonedTestRepository;
- private IFile testFile;
-
@Before
public void setUp() throws Exception {
Activator.getDefault().getRepositoryCache().clear();
@@ -51,14 +51,12 @@
createMockSystemReader();
this.testProject = new TestProject(true);
- this.testFile = testUtils.addFileToProject(testProject.getProject(), "a.txt", "1234");
this.gitDir = createGitDir(testProject);
this.testRepository = new TestRepository(gitDir);
setUserAndEmail(testRepository);
testRepository.connect(testProject.getProject());
- testRepository.addAndCommit(testProject.getProject(), testFile.getLocation().toFile(), "commit");
-
+
this.clonedTestRepository = cloneRepository(testRepository.getRepository());
}
@@ -132,37 +130,31 @@
public void canCommitFileInProject() throws Exception {
IFile file = testUtils.addFileToProject(
testProject.getProject(),
- "b.txt", "some text");
+ "a.txt", "some text");
addToRepository(file, testRepository);
EGitUtils.commit(testProject.getProject(), null);
testUtils.assertRepositoryContainsFiles(testRepository.getRepository(),
- new String[] { testUtils.getRepositoryPath(file), testUtils.getRepositoryPath(testFile) });
+ new String[] { testUtils.getRepositoryPath(file) });
}
@Test
public void canPushRepoToAntoherRepo() throws Exception {
- String clonedFilePath = testUtils.getRepositoryPath(testFile);
- File clonedFile = new File(clonedFilePath);
- FileWriter writer = new FileWriter(clonedFile);
- writer.write("4321");
- writer.close();
-
+ newRepositoryFile("b.txt", "9876", clonedTestRepository.getRepository());
new Git(clonedTestRepository.getRepository())
- .commit()
- .setCommitter(GIT_USER, GIT_EMAIL)
- .setMessage("commit")
- .call();
+ .add().addFilepattern("b.txt").call();
+ new Git(clonedTestRepository.getRepository())
+ .commit().setCommitter(GIT_USER, GIT_EMAIL).setMessage("commit").call();
EGitUtils.push(clonedTestRepository.getRepository(), null);
testUtils.assertRepositoryContainsFilesWithContent(
testRepository.getRepository(),
- testUtils.getRepositoryPath(testFile),
- "4321");
- }
+ "b.txt",
+ "9876");
+ }
private void addToRepository(IFile file, TestRepository testRepository) throws IOException, CoreException {
// List<IResource> resources = new ArrayList<IResource>();
@@ -170,4 +162,20 @@
// new AddToIndexOperation(resources).execute(null);
testRepository.track(new File(file.getLocation().toOSString()));
}
+
+ private static void newRepositoryFile(String name, String data, Repository repository) throws IOException {
+ File file = new File(repository.getWorkTree(), name);
+ write(file, data);
+ }
+
+ private static void write(final File file, final String body) throws IOException {
+ FileUtils.mkdirs(file.getParentFile(), true);
+ Writer w = new OutputStreamWriter(new FileOutputStream(file), "UTF-8");
+ try {
+ w.write(body);
+ } finally {
+ w.close();
+ }
+ }
+
}
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34096 - in trunk/as/tests/org.jboss.ide.eclipse.as.egit.test: src/org/jboss/ide/eclipse/as/egit/internal/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-19 12:22:55 -0400 (Fri, 19 Aug 2011)
New Revision: 34096
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/META-INF/MANIFEST.MF
trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestRepository.java
trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestUtils.java
Log:
[JBIDE-9513] implementing push test
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/META-INF/MANIFEST.MF 2011-08-19 16:22:44 UTC (rev 34095)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/META-INF/MANIFEST.MF 2011-08-19 16:22:55 UTC (rev 34096)
@@ -10,6 +10,7 @@
org.eclipse.jgit;bundle-version="[1.1.0,2.0.0)",
org.eclipse.core.runtime,
org.eclipse.core.resources;bundle-version="[3.7.100,4.0.0)",
+ org.eclipse.core.filesystem;bundle-version="1.3.100",
org.junit;bundle-version="[4.8.2,5.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java 2011-08-19 16:22:44 UTC (rev 34095)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java 2011-08-19 16:22:55 UTC (rev 34096)
@@ -1,28 +1,26 @@
package org.jboss.ide.eclipse.as.egit.internal.test;
import java.io.File;
+import java.io.FileWriter;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.egit.core.Activator;
import org.eclipse.egit.core.RepositoryCache;
-import org.eclipse.egit.core.op.AddToIndexOperation;
import org.eclipse.egit.core.op.CloneOperation;
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.util.FileUtils;
import org.eclipse.jgit.util.SystemReader;
-import org.jboss.ide.eclipse.as.egit.core.EgitUtils;
+import org.jboss.ide.eclipse.as.egit.core.EGitUtils;
import org.jboss.ide.eclipse.as.egit.internal.test.util.MockSystemReader;
import org.jboss.ide.eclipse.as.egit.internal.test.util.TestProject;
import org.jboss.ide.eclipse.as.egit.internal.test.util.TestRepository;
@@ -33,83 +31,99 @@
public class EGitUtilsTest {
+ private static final String GIT_EMAIL = "dummyUser(a)redhat.com";
+
+ private static final String GIT_USER = "dummyUser";
+
protected final TestUtils testUtils = new TestUtils();
- private List<IResource> resources = new ArrayList<IResource>();
private File gitDir;
private TestRepository testRepository;
- private Repository repository;
private TestProject testProject;
- private IProject project;
private TestRepository clonedTestRepository;
+ private IFile testFile;
+
@Before
public void setUp() throws Exception {
Activator.getDefault().getRepositoryCache().clear();
+ createMockSystemReader();
+
this.testProject = new TestProject(true);
- this.project = testProject.getProject();
+ this.testFile = testUtils.addFileToProject(testProject.getProject(), "a.txt", "1234");
- createMockSystemReader();
-
this.gitDir = createGitDir(testProject);
this.testRepository = new TestRepository(gitDir);
- this.repository = testRepository.getRepository();
- testRepository.connect(project);
+ setUserAndEmail(testRepository);
+ testRepository.connect(testProject.getProject());
+ testRepository.addAndCommit(testProject.getProject(), testFile.getLocation().toFile(), "commit");
+
+ this.clonedTestRepository = cloneRepository(testRepository.getRepository());
+ }
- this.clonedTestRepository = cloneRepository(repository);
+ private void setUserAndEmail(TestRepository testRepository) {
+ StoredConfig config = testRepository.getRepository().getConfig();
+ config.setString(ConfigConstants.CONFIG_USER_SECTION, null, ConfigConstants.CONFIG_KEY_NAME,
+ GIT_USER);
+ config.setString(ConfigConstants.CONFIG_USER_SECTION, null, ConfigConstants.CONFIG_KEY_EMAIL,
+ GIT_EMAIL);
}
private TestRepository cloneRepository(Repository repository) throws URISyntaxException, InvocationTargetException,
InterruptedException, IOException {
URIish uri = new URIish("file:///" + repository.getDirectory().toString());
- String repoParent = repository.getDirectory().getParent();
+ File workspaceDir = ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile();
File clonedRepositoryFile =
- new File(repoParent, "clonedRepository-" + String.valueOf(System.currentTimeMillis()));
+ new File(workspaceDir, "clonedRepository-" + String.valueOf(System.currentTimeMillis()));
CloneOperation clop =
- new CloneOperation(uri, true, null, clonedRepositoryFile, "refs/heads/master", "origin", 0);
+ new CloneOperation(uri, true, null, clonedRepositoryFile, Constants.R_HEADS + Constants.MASTER,
+ Constants.DEFAULT_REMOTE_NAME, 0);
clop.run(null);
RepositoryCache repositoryCache = Activator.getDefault().getRepositoryCache();
- Repository clonedRepository =
- repositoryCache.lookupRepository(new File(clonedRepositoryFile, Constants.DOT_GIT));
- return new TestRepository(clonedRepository);
+ Repository clonedRepository = repositoryCache
+ .lookupRepository(new File(clonedRepositoryFile, Constants.DOT_GIT));
+ TestRepository testRepository = new TestRepository(clonedRepository);
+ // Repository clonedRepository = new FileRepository(new
+ // File(clonedRepositoryFile, Constants.DOT_GIT));
+ // TestRepository testRepository = new TestRepository(clonedRepository);
+ // we push to branch "test" of repository2
+ // RefUpdate createBranch = testRepository.getRepository().updateRef(
+ // "refs/heads/test");
+ // createBranch.setNewObjectId(testRepository.getRepository().resolve(
+ // "refs/heads/master"));
+ // createBranch.update();
+
+ return testRepository;
}
private void createMockSystemReader() {
MockSystemReader mockSystemReader = new MockSystemReader();
SystemReader.setInstance(mockSystemReader);
+ File workspaceFile = ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile()
+ .getAbsoluteFile();
mockSystemReader.setProperty(Constants.GIT_CEILING_DIRECTORIES_KEY,
- ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile()
- .getAbsoluteFile().toString());
+ workspaceFile.toString());
}
private File createGitDir(TestProject testProject) throws IOException {
- IPath workspaceRoot = project.getWorkspace().getRoot().getRawLocation();
- // IPath randomFolder =
- // workspaceRoot.append(String.valueOf(System.currentTimeMillis()));
- // File gitDir = new File(randomFolder.toFile(), Constants.DOT_GIT);
- File gitDir = new File(workspaceRoot.toFile(), Constants.DOT_GIT);
- if (gitDir.exists()) {
- // guard
- FileUtils.delete(gitDir, FileUtils.RECURSIVE | FileUtils.RETRY);
- }
- return gitDir;
+ return new File(testProject.getProject().getLocation().toFile(), Constants.DOT_GIT);
}
@After
public void tearDown() throws Exception {
cleanupRepository(testRepository);
cleanupRepository(clonedTestRepository);
-
+
testProject.dispose();
- project = null;
Activator.getDefault().getRepositoryCache().clear();
}
private static void cleanupRepository(TestRepository testRepository) throws IOException {
File repositoryDirectory = testRepository.getRepository().getDirectory();
- if (repositoryDirectory.exists()) {
- FileUtils.delete(repositoryDirectory, FileUtils.RECURSIVE | FileUtils.RETRY);
+ File repositoryParent = repositoryDirectory.getParentFile();
+ if (repositoryParent.exists()) {
+ FileUtils.delete(repositoryParent, FileUtils.RECURSIVE | FileUtils.RETRY);
}
testRepository.dispose();
}
@@ -118,25 +132,42 @@
public void canCommitFileInProject() throws Exception {
IFile file = testUtils.addFileToProject(
testProject.getProject(),
- "a.txt", "some text");
- resources.add(file);
- new AddToIndexOperation(resources).execute(null);
+ "b.txt", "some text");
+ addToRepository(file, testRepository);
- EgitUtils.commit(project, null);
+ EGitUtils.commit(testProject.getProject(), null);
- testUtils.assertRepositoryContainsFiles(repository, new String[] { testUtils.getRepositoryPath(file) });
+ testUtils.assertRepositoryContainsFiles(testRepository.getRepository(),
+ new String[] { testUtils.getRepositoryPath(file), testUtils.getRepositoryPath(testFile) });
}
@Test
public void canPushRepoToAntoherRepo() throws Exception {
- IFile file = testUtils.addFileToProject(testProject.getProject(), "a.txt", "some text");
- resources.add(file);
- new AddToIndexOperation(resources).execute(null);
- EgitUtils.commit(project, null);
- EgitUtils.push(clonedTestRepository.getRepository(), null);
+ String clonedFilePath = testUtils.getRepositoryPath(testFile);
+ File clonedFile = new File(clonedFilePath);
+ FileWriter writer = new FileWriter(clonedFile);
+ writer.write("4321");
+ writer.close();
- testUtils.assertRepositoryContainsFiles(repository, new String[] { testUtils.getRepositoryPath(file) });
+ new Git(clonedTestRepository.getRepository())
+ .commit()
+ .setCommitter(GIT_USER, GIT_EMAIL)
+ .setMessage("commit")
+ .call();
+
+ EGitUtils.push(clonedTestRepository.getRepository(), null);
+
+ testUtils.assertRepositoryContainsFilesWithContent(
+ testRepository.getRepository(),
+ testUtils.getRepositoryPath(testFile),
+ "4321");
+ }
+
+ private void addToRepository(IFile file, TestRepository testRepository) throws IOException, CoreException {
+ // List<IResource> resources = new ArrayList<IResource>();
+ // resources.add(file);
+ // new AddToIndexOperation(resources).execute(null);
+ testRepository.track(new File(file.getLocation().toOSString()));
}
-
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestRepository.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestRepository.java 2011-08-19 16:22:44 UTC (rev 34095)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestRepository.java 2011-08-19 16:22:55 UTC (rev 34096)
@@ -48,7 +48,7 @@
/**
* Helper class for creating and filling a test repository
- *
+ *
*/
public class TestRepository {
@@ -58,7 +58,7 @@
/**
* Creates a new test repository
- *
+ *
* @param gitDir
* @throws IOException
*/
@@ -80,7 +80,7 @@
/**
* Creates a test repository from an existing Repository
- *
+ *
* @param repository
* @throws IOException
*/
@@ -105,7 +105,7 @@
/**
* create an initial commit containing a file "dummy" in the
- *
+ *
* @param message
* commit message
* @return commit object
@@ -129,7 +129,7 @@
/**
* Create a file or get an existing one
- *
+ *
* @param project
* instance of project inside with file will be created
* @param name
@@ -151,7 +151,7 @@
/**
* Track, add to index and finally commit given file
- *
+ *
* @param project
* @param file
* @param commitMessage
@@ -169,7 +169,7 @@
/**
* Appends file content to given file, then track, add to index and finally
* commit it.
- *
+ *
* @param project
* @param file
* @param content
@@ -186,7 +186,7 @@
/**
* Appends file content to given file, then track, add to index and finally
* commit it.
- *
+ *
* @param project
* @param file
* @param content
@@ -205,11 +205,11 @@
/**
* Commits the current index
- *
+ *
* @param message
* commit message
* @return commit object
- *
+ *
* @throws NoHeadException
* @throws NoMessageException
* @throws UnmergedPathException
@@ -231,13 +231,13 @@
/**
* Adds file to version control
- *
+ *
* @param file
* @throws IOException
*/
public void track(File file) throws IOException {
- String repoPath = getRepoRelativePath(new Path(file.getPath())
- .toString());
+ String repoPath = getRepoRelativePath(
+ new Path(file.getPath()).toString());
try {
new Git(repository).add().addFilepattern(repoPath).call();
} catch (NoFilepatternException e) {
@@ -247,7 +247,7 @@
/**
* Creates a new branch and immediately checkout it.
- *
+ *
* @param refName
* starting point for the new branch
* @param newRefName
@@ -260,7 +260,7 @@
/**
* Creates a new branch
- *
+ *
* @param refName
* starting point for the new branch
* @param newRefName
@@ -286,7 +286,7 @@
/**
* Checkouts branch
- *
+ *
* @param refName
* full name of branch
* @throws CoreException
@@ -297,7 +297,7 @@
/**
* Adds the given file to the index
- *
+ *
* @param project
* @param file
* @throws Exception
@@ -307,10 +307,9 @@
addToIndex(iFile);
}
-
/**
* Adds the given file to the index
- *
+ *
* @param file
* @throws CoreException
* @throws IOException
@@ -326,7 +325,7 @@
/**
* Appends content to end of given file.
- *
+ *
* @param file
* @param content
* @throws IOException
@@ -337,7 +336,7 @@
/**
* Appends content to end of given file.
- *
+ *
* @param file
* @param content
* @throws IOException
@@ -348,7 +347,7 @@
/**
* Appends content to given file.
- *
+ *
* @param file
* @param content
* @param append
@@ -363,7 +362,7 @@
/**
* Appends content to given file.
- *
+ *
* @param file
* @param content
* @param append
@@ -385,7 +384,7 @@
/**
* Checks if a file with the given path exists in the HEAD tree
- *
+ *
* @param path
* @return true if the file exists
* @throws IOException
@@ -464,7 +463,7 @@
/**
* Connect a project to this repository
- *
+ *
* @param project
* @throws CoreException
*/
@@ -476,7 +475,7 @@
/**
* Disconnects provider from project
- *
+ *
* @param project
* @throws CoreException
*/
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestUtils.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestUtils.java 2011-08-19 16:22:44 UTC (rev 34095)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestUtils.java 2011-08-19 16:22:55 UTC (rev 34096)
@@ -257,6 +257,9 @@
public String getRepositoryPath(IResource resource) {
RepositoryMapping mapping = RepositoryMapping.getMapping(resource);
+ if (mapping == null) {
+ throw new IllegalArgumentException(resource + " is not in any repository");
+ }
return mapping.getRepoRelativePath(resource);
}
14 years, 7 months
- 1
- 0