Author: scabanovich
Date: 2009-10-19 12:31:58 -0400 (Mon, 19 Oct 2009)
New Revision: 18164
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DefaultDropCommand.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DefaultDropWizardModel.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropWizard.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagProposalsComposite.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5043
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DefaultDropCommand.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DefaultDropCommand.java 2009-10-19
15:17:05 UTC (rev 18163)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DefaultDropCommand.java 2009-10-19
16:31:58 UTC (rev 18164)
@@ -67,7 +67,7 @@
ITagProposal[] proposals
= TagProposalsComposite.getTagProposals(
getDefaultModel().getDropData().getMimeType(),
- getDefaultModel().getDropData().getMimeData(),
+ getDefaultModel().getDropData(),
tagProposalFactory
);
if(proposals.length==1) {
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DefaultDropWizardModel.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DefaultDropWizardModel.java 2009-10-19
15:17:05 UTC (rev 18163)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DefaultDropWizardModel.java 2009-10-19
16:31:58 UTC (rev 18164)
@@ -61,7 +61,9 @@
public void setAttributeValue(String name, Object value) {
if(name==null) throw new IllegalArgumentException("Attribute name cannot be
null"); //$NON-NLS-1$
AttributeDescriptorValue descrValue = findDescriptor(name);
- if(descrValue==null) throw new IllegalArgumentException("Attribute '" +
name + "' not found"); //$NON-NLS-1$ //$NON-NLS-2$
+ if(descrValue==null) {
+ throw new IllegalArgumentException("Attribute '" + name + "'
not found"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
descrValue.setValue(value);
fireModelChaged(ATTRIBUTE_VALUE,null,descrValue);
}
@@ -190,7 +192,7 @@
ITagProposal[] proposals
= TagProposalsComposite.getTagProposals(
getDropData().getMimeType(),
- getDropData().getMimeData(),
+ getDropData(),
tagProposalFactory
);
if(proposals.length>1) {
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropWizard.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropWizard.java 2009-10-19
15:17:05 UTC (rev 18163)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropWizard.java 2009-10-19
16:31:58 UTC (rev 18164)
@@ -47,10 +47,10 @@
page1 = new TagProposalsWizardPage();
page2 = new TagAttributesWizardPage();
ITagProposal[] proposals =
- TagProposalsComposite.getTagProposals(getMimeType(),getMimeData(),
fDropCommand.getTagProposalFactory());
+ TagProposalsComposite.getTagProposals(getMimeType(),getWizardModel().getDropData(),
fDropCommand.getTagProposalFactory());
if(TagProposalsComposite.areThereTagProposals(
- getMimeType(),getMimeData(), fDropCommand.getTagProposalFactory())
+ getMimeType(),getWizardModel().getDropData(), fDropCommand.getTagProposalFactory())
) {
if(proposals.length>1) {
this.addPage(page1);
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagProposalsComposite.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagProposalsComposite.java 2009-10-19
15:17:05 UTC (rev 18163)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagProposalsComposite.java 2009-10-19
16:31:58 UTC (rev 18164)
@@ -26,6 +26,7 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
+import org.jboss.tools.common.model.ui.editors.dnd.DropData;
import org.jboss.tools.common.model.ui.editors.dnd.IDropWizardModel;
import org.jboss.tools.common.model.ui.editors.dnd.ITagProposal;
import org.jboss.tools.common.model.ui.editors.dnd.ITagProposalFactory;
@@ -44,7 +45,7 @@
model.getTagProposalFactory().getProposalLoader(
fModel.getDropData().getMimeType()
).getTagProposals(
- fModel.getDropData().getMimeData()
+ fModel.getDropData()
);
GridLayout layout = new GridLayout();
@@ -163,11 +164,11 @@
return getTagProposals().length>0;
}
- public static boolean areThereTagProposals(String mimeType,String dropData,
ITagProposalFactory tagProposalFactory) {
+ public static boolean areThereTagProposals(String mimeType,DropData dropData,
ITagProposalFactory tagProposalFactory) {
return
tagProposalFactory.getProposalLoader(mimeType).getTagProposals(dropData).length>0;
}
- public static ITagProposal[] getTagProposals(String mimeType,String dropData,
ITagProposalFactory tagProposalFactory) {
+ public static ITagProposal[] getTagProposals(String mimeType,DropData dropData,
ITagProposalFactory tagProposalFactory) {
return tagProposalFactory.getProposalLoader(mimeType).getTagProposals(dropData);
}