JBoss Tools SVN: r16573 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-07-15 04:19:45 -0400 (Wed, 15 Jul 2009)
New Revision: 16573
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java
Log:
JBIDE-4615: no display the detail of a partnerlinktype when switch from 'From Imports' to 'From Project' in the 'Choose the Parnerlink type' wizard
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java 2009-07-15 07:23:53 UTC (rev 16572)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java 2009-07-15 08:19:45 UTC (rev 16573)
@@ -576,7 +576,10 @@
fFilteredList.setEnabled(true);
fFilteredList.setAllowDuplicates(showDuplicates);
- fFilteredList.setElements( contentProvider.getElements( fProjectObjects ) );
+ fFilteredList.setElements( contentProvider.getElements( fProjectObjects ) );
+ // add by Grid.Qian
+ // update the fTreeViewer because for now the fTreeViewer's input is null
+ updateLowerViewWidget(fFilteredList.getSelection());
}
}
16 years, 9 months
JBoss Tools SVN: r16572 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: configuration/editors/uitls and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-07-15 03:23:53 -0400 (Wed, 15 Jul 2009)
New Revision: 16572
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/ComponentUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DelimitersUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormEditor.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIMappingNodeEditPart.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeEditPart.java
Log:
JBIDE-4592
adjust the layout of the mapping editor
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/ComponentUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/ComponentUICreator.java 2009-07-14 17:19:19 UTC (rev 16571)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/ComponentUICreator.java 2009-07-15 07:23:53 UTC (rev 16572)
@@ -46,4 +46,17 @@
formEditor,part);
}
+ /* (non-Javadoc)
+ * @see org.jboss.tools.smooks.configuration.editors.PropertyUICreator#ignoreProperty(org.eclipse.emf.ecore.EAttribute)
+ */
+ @Override
+ public boolean ignoreProperty(EAttribute feature) {
+ if(feature == MEdiPackage.Literals.MAPPING_NODE__XMLTAG){
+ return true;
+ }
+ return super.ignoreProperty(feature);
+ }
+
+
+
}
\ No newline at end of file
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DelimitersUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DelimitersUICreator.java 2009-07-14 17:19:19 UTC (rev 16571)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DelimitersUICreator.java 2009-07-15 07:23:53 UTC (rev 16572)
@@ -17,6 +17,8 @@
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
+import org.jboss.tools.smooks.configuration.editors.uitls.IModelProcsser;
+import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
import org.jboss.tools.smooks.editor.ISmooksModelProvider;
import org.jboss.tools.smooks.model.medi.MEdiPackage;
@@ -35,20 +37,133 @@
* org.eclipse.emf.ecore.EAttribute)
*/
public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
- IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
- ISmooksModelProvider formEditor, IEditorPart part) {
-
+ IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
+ ISmooksModelProvider formEditor, IEditorPart part) {
+
if (feature == MEdiPackage.eINSTANCE.getDelimiters_Component()) {
+ return SmooksUIUtils.createChoiceFieldEditor(parent, toolkit, propertyDescriptor, model,
+ new String[] { ENTER_CHAR_STRING }, new IModelProcsser() {
+
+ public Object unwrapValue(Object model) {
+ if (model == null)
+ return null;
+ if (model instanceof String) {
+ if (((String) model).equals("\n")) {
+ return ENTER_CHAR_STRING;
+ }
+ return model.toString();
+ }
+ return null;
+ }
+
+ public Object wrapValue(Object model) {
+ if (model == null)
+ return null;
+ if (model instanceof String) {
+ if (((String) model).equals(ENTER_CHAR_STRING)) {
+ return "\n";
+ }
+ return model.toString();
+ }
+ return null;
+ }
+
+ }, false);
}
if (feature == MEdiPackage.eINSTANCE.getDelimiters_Field()) {
+ return SmooksUIUtils.createChoiceFieldEditor(parent, toolkit, propertyDescriptor, model,
+ new String[] { ENTER_CHAR_STRING }, new IModelProcsser() {
+
+ public Object unwrapValue(Object model) {
+ if (model == null)
+ return null;
+ if (model instanceof String) {
+ if (((String) model).equals("\n")) {
+ return ENTER_CHAR_STRING;
+ }
+ return model.toString();
+ }
+ return null;
+ }
+
+ public Object wrapValue(Object model) {
+ if (model == null)
+ return null;
+ if (model instanceof String) {
+ if (((String) model).equals(ENTER_CHAR_STRING)) {
+ return "\n";
+ }
+ return model.toString();
+ }
+ return null;
+ }
+
+ }, false);
}
if (feature == MEdiPackage.eINSTANCE.getDelimiters_Segment()) {
+ return SmooksUIUtils.createChoiceFieldEditor(parent, toolkit, propertyDescriptor, model,
+ new String[] { ENTER_CHAR_STRING }, new IModelProcsser() {
+
+ public Object unwrapValue(Object model) {
+ if (model == null)
+ return null;
+ if (model instanceof String) {
+ if (((String) model).equals("\n")) {
+ return ENTER_CHAR_STRING;
+ }
+ return model.toString();
+ }
+ return null;
+ }
+
+ public Object wrapValue(Object model) {
+ if (model == null)
+ return null;
+ if (model instanceof String) {
+ if (((String) model).equals(ENTER_CHAR_STRING)) {
+ return "\n";
+ }
+ return model.toString();
+ }
+ return null;
+ }
+
+ }, false);
}
if (feature == MEdiPackage.eINSTANCE.getDelimiters_SubComponent()) {
+ return SmooksUIUtils.createChoiceFieldEditor(parent, toolkit, propertyDescriptor, model,
+ new String[] { ENTER_CHAR_STRING }, new IModelProcsser() {
+
+ public Object unwrapValue(Object model) {
+ if (model == null)
+ return null;
+ if (model instanceof String) {
+ if (((String) model).equals("\n")) {
+ return ENTER_CHAR_STRING;
+ }
+ return model.toString();
+ }
+ return null;
+ }
+
+ public Object wrapValue(Object model) {
+ if (model == null)
+ return null;
+ if (model instanceof String) {
+ if (((String) model).equals(ENTER_CHAR_STRING)) {
+ return "\n";
+ }
+ return model.toString();
+ }
+ return null;
+ }
+
+ }, false);
}
- return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature,
- formEditor,part);
+ return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor, part);
}
+
+ public static final String ENTER_CHAR_STRING = "<Enter>";
}
\ No newline at end of file
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentUICreator.java 2009-07-14 17:19:19 UTC (rev 16571)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentUICreator.java 2009-07-15 07:23:53 UTC (rev 16572)
@@ -59,9 +59,9 @@
*/
@Override
public boolean ignoreProperty(EAttribute feature) {
- if (feature == MEdiPackage.Literals.MAPPING_NODE__XMLTAG) {
- return true;
- }
+// if (feature == MEdiPackage.Literals.MAPPING_NODE__XMLTAG) {
+// return true;
+// }
if (feature == MEdiPackage.Literals.SEGMENT__SEGCODE) {
return true;
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-07-14 17:19:19 UTC (rev 16571)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-07-15 07:23:53 UTC (rev 16572)
@@ -111,6 +111,7 @@
import org.jboss.tools.smooks.configuration.editors.FieldMarkerComposite;
import org.jboss.tools.smooks.configuration.editors.FileSelectionWizard;
import org.jboss.tools.smooks.configuration.editors.GraphicsConstants;
+import org.jboss.tools.smooks.configuration.editors.IFilePathProcessor;
import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject;
import org.jboss.tools.smooks.configuration.editors.OpenFileHyperLinkListener;
import org.jboss.tools.smooks.configuration.editors.SelectorAttributes;
@@ -575,6 +576,16 @@
Object model, boolean multiText, boolean linkLabel, boolean openFile, int height,
IHyperlinkListener listener, int valueType, OpenEditorEditInnerContentsAction openEditorAction,
boolean expandEditor) {
+ return createStringFieldEditor(label, parent, editingdomain, toolkit, itemPropertyDescriptor, model, multiText,
+ linkLabel, openFile, new ClassPathFileProcessor(), height, listener, valueType, openEditorAction,
+ expandEditor);
+ }
+
+ public static AttributeFieldEditPart createStringFieldEditor(String label, final Composite parent,
+ EditingDomain editingdomain, FormToolkit toolkit, final IItemPropertyDescriptor itemPropertyDescriptor,
+ Object model, boolean multiText, boolean linkLabel, boolean openFile, IFilePathProcessor filePathProcessor,
+ int height, IHyperlinkListener listener, int valueType, OpenEditorEditInnerContentsAction openEditorAction,
+ boolean expandEditor) {
AttributeFieldEditPart fieldEditPart = new AttributeFieldEditPart();
GridData gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
Section section = null;
@@ -706,6 +717,7 @@
toolkit.paintBordersFor(textContainer);
if (openFile) {
+ final IFilePathProcessor processor = filePathProcessor;
Button fileBrowseButton = toolkit.createButton(textContainer, "Browse", SWT.NONE);
fileBrowseButton.addSelectionListener(new SelectionAdapter() {
@@ -716,7 +728,7 @@
if (resource != null) {
initSelections = new Object[] { resource };
}
- wizard.setFilePathProcessor(new ClassPathFileProcessor());
+ wizard.setFilePathProcessor(processor);
wizard.setInitSelections(initSelections);
List<ViewerFilter> filterList = new ArrayList<ViewerFilter>();
filterList.add(new CurrentProjecViewerFilter(resource));
@@ -1304,7 +1316,12 @@
if (currentSelect != -1) {
combo.select(currentSelect);
+ } else {
+
}
+ if (editValue instanceof String) {
+ combo.setText(editValue.toString());
+ }
final Object fm = model;
final ItemPropertyDescriptor fipd = (ItemPropertyDescriptor) itemPropertyDescriptor;
final IModelProcsser fp = processer;
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormEditor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormEditor.java 2009-07-14 17:19:19 UTC (rev 16571)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormEditor.java 2009-07-15 07:23:53 UTC (rev 16572)
@@ -92,18 +92,18 @@
if(map == null){
map = MEdiFactory.eINSTANCE.createEdiMap();
((DocumentRoot)smooksModel).setEdimap(map);
- Description description = map.getDescription();
- if(description == null){
- description = MEdiFactory.eINSTANCE.createDescription();
- map.setDescription(description);
- }
-
- Delimiters delimiters = map.getDelimiters();
- if(delimiters == null){
- delimiters = MEdiFactory.eINSTANCE.createDelimiters();
- map.setDelimiters(delimiters);
- }
}
+ Description description = map.getDescription();
+ if(description == null){
+ description = MEdiFactory.eINSTANCE.createDescription();
+ map.setDescription(description);
+ }
+
+ Delimiters delimiters = map.getDelimiters();
+ if(delimiters == null){
+ delimiters = MEdiFactory.eINSTANCE.createDelimiters();
+ map.setDelimiters(delimiters);
+ }
}
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java 2009-07-14 17:19:19 UTC (rev 16571)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java 2009-07-15 07:23:53 UTC (rev 16572)
@@ -22,6 +22,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.stream.StreamSource;
@@ -87,7 +88,9 @@
import org.eclipse.ui.forms.widgets.Hyperlink;
import org.eclipse.ui.forms.widgets.ScrolledForm;
import org.eclipse.ui.forms.widgets.Section;
+import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator;
import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
+import org.jboss.tools.smooks.configuration.editors.IFilePathProcessor;
import org.jboss.tools.smooks.configuration.editors.ModelPanelCreator;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
import org.jboss.tools.smooks.configuration.editors.xml.TagList;
@@ -108,6 +111,7 @@
import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection;
import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel;
import org.jboss.tools.smooks.model.graphics.ext.FigureType;
+import org.jboss.tools.smooks.model.graphics.ext.GraphFactory;
import org.jboss.tools.smooks.model.graphics.ext.GraphType;
import org.jboss.tools.smooks.model.graphics.ext.ISmooksGraphChangeListener;
import org.jboss.tools.smooks.model.graphics.ext.InputType;
@@ -165,6 +169,8 @@
private Composite delimitersComposite;
+ private String ediFileEncoding = "UTF-8";
+
public EDIMapFormPage(FormEditor editor, String id, String title) {
super(editor, id, title);
if (editor instanceof ISmooksModelProvider) {
@@ -382,15 +388,6 @@
disposeCompositeControls(delimitersComposite, null);
- AttributeFieldEditPart pathEditPart = SmooksUIUtils.createFileSelectionTextFieldEditor("EDI Mapping File",
- delimitersComposite, editingDomain, toolkit, null, null, SmooksUIUtils.VALUE_TYPE_TEXT, null, null);
- final Text ediFileText = (Text) pathEditPart.getContentControl();
- String filePath = getEDIFilePath();
- if (filePath != null) {
- ediFileText.setText(filePath);
- }
- ediFileText.addModifyListener(this);
-
if (delimitersCreator != null) {
IItemPropertySource itemPropertySource = (IItemPropertySource) editingDomain.getAdapterFactory().adapt(
delimiters, IItemPropertySource.class);
@@ -449,6 +446,26 @@
return null;
}
+ private String getEDIFileEncoding() {
+ if (modelProvider != null) {
+ SmooksGraphicsExtType ext = modelProvider.getSmooksGraphicsExt();
+ List<InputType> inputList = ext.getInput();
+ for (Iterator<?> iterator = inputList.iterator(); iterator.hasNext();) {
+ InputType inputType = (InputType) iterator.next();
+ if (SmooksModelUtils.INPUT_TYPE_EDI.equals(inputType.getType())) {
+ List<ParamType> paramList = inputType.getParam();
+ for (Iterator<?> iterator2 = paramList.iterator(); iterator2.hasNext();) {
+ ParamType paramType = (ParamType) iterator2.next();
+ if ("encoding".equals(paramType.getName())) {
+ return paramType.getValue();
+ }
+ }
+ }
+ }
+ }
+ return null;
+ }
+
private ActionRegistry getActionRegistry() {
if (actionRegistry == null)
actionRegistry = new ActionRegistry();
@@ -609,7 +626,7 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.verticalAlignment = GridData.BEGINNING;
descriptionSection.setLayoutData(gd);
- descriptionSection.setText("Mapping Description");
+ descriptionSection.setText("Description");
FillLayout flayout = new FillLayout();
descriptionSection.setLayout(flayout);
@@ -631,53 +648,12 @@
descriptionCreator.createModelPanel(toolkit, descriptorComposite, modelProvider, getEditor());
}
- Hyperlink showTransformResultLink = toolkit.createHyperlink(desciptorContainer, "Test EDI transform", SWT.NONE);
- // showTransformResultLink.setVisible(false);
- showTransformResultLink.addHyperlinkListener(new IHyperlinkListener() {
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.ui.forms.events.IHyperlinkListener#linkActivated(
- * org.eclipse.ui.forms.events.HyperlinkEvent)
- */
- public void linkActivated(HyperlinkEvent e) {
- testEDITransform();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.ui.forms.events.IHyperlinkListener#linkEntered(org
- * .eclipse.ui.forms.events.HyperlinkEvent)
- */
- public void linkEntered(HyperlinkEvent e) {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.ui.forms.events.IHyperlinkListener#linkExited(org
- * .eclipse.ui.forms.events.HyperlinkEvent)
- */
- public void linkExited(HyperlinkEvent e) {
-
- }
-
- });
- gd = new GridData();
- showTransformResultLink.setLayoutData(gd);
-
Section delimiterSection = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.DESCRIPTION);
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.verticalAlignment = GridData.BEGINNING;
gd.verticalSpan = 2;
delimiterSection.setLayoutData(gd);
- delimiterSection.setText("EDI File Configurations");
+ delimiterSection.setText("Delimiters");
FillLayout flayout1 = new FillLayout();
delimiterSection.setLayout(flayout1);
@@ -687,8 +663,56 @@
delimitersComposite.setLayout(gl1);
delimiterSection.setClient(delimitersComposite);
- AttributeFieldEditPart pathEditPart = SmooksUIUtils.createFileSelectionTextFieldEditor("EDI Mapping File",
- delimitersComposite, editingDomain, toolkit, null, null, SmooksUIUtils.VALUE_TYPE_TEXT, null, null);
+ if (delimitersCreator != null) {
+ Map<Object, Object> editPartMap = delimitersCreator.createModelPanel(toolkit, delimitersComposite,
+ modelProvider, getEditor());
+ handleDelimiterFieldEditor(editPartMap);
+ }
+
+ Section testSection = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.DESCRIPTION);
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.verticalAlignment = GridData.BEGINNING;
+ // gd.horizontalSpan = 2;
+ testSection.setLayoutData(gd);
+ testSection.setText("EDI File Setting");
+ FillLayout flayout2 = new FillLayout();
+ testSection.setLayout(flayout2);
+
+ Composite fileComposite = toolkit.createComposite(testSection, SWT.NONE);
+ GridLayout fgl = new GridLayout();
+ fgl.numColumns = 2;
+ fileComposite.setLayout(fgl);
+ testSection.setClient(fileComposite);
+
+ AttributeFieldEditPart pathEditPart = SmooksUIUtils.createStringFieldEditor("EDI File", fileComposite,
+ editingDomain, toolkit, null, null, false, false, true, new IFilePathProcessor() {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.configuration.editors.
+ * IFilePathProcessor
+ * #processFileSystemPath(java.lang.String)
+ */
+ public String processFileSystemPath(String filePath) {
+ return filePath;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.configuration.editors.
+ * IFilePathProcessor
+ * #processWorkBenchPath(org.eclipse.core.resources.IFile)
+ */
+ public String processWorkBenchPath(IFile file) {
+ String s = file.getFullPath().toPortableString();
+ s = SmooksUIUtils.WORKSPACE_PRIX + s;
+ return s;
+ }
+
+ }, 0, null, -1, null, false);
+
final Text ediFileText = (Text) pathEditPart.getContentControl();
String filePath = getEDIFilePath();
if (filePath != null) {
@@ -696,23 +720,88 @@
}
ediFileText.addModifyListener(this);
- if (delimitersCreator != null) {
- Map<Object, Object> editPartMap = delimitersCreator.createModelPanel(toolkit, delimitersComposite,
- modelProvider, getEditor());
- handleDelimiterFieldEditor(editPartMap);
+ AttributeFieldEditPart encodingEditPart = SmooksUIUtils.createStringFieldEditor("EDI File Encoding",
+ fileComposite, editingDomain, toolkit, null, null, false, false, false, 0, null, -1, null);
+ final Text encodingText = (Text) encodingEditPart.getContentControl();
+ String encoding = getEDIFileEncoding();
+ if (encoding != null) {
+ encodingText.setText(encoding);
}
+ encodingText.addModifyListener(new ModifyListener() {
- // Section testSection = toolkit.createSection(form.getBody(),
- // Section.TITLE_BAR | Section.TWISTIE | Section.DESCRIPTION);
- // gd = new GridData(GridData.FILL_HORIZONTAL);
- // gd.verticalAlignment = GridData.BEGINNING;
- // // gd.horizontalSpan = 2;
- // testSection.setLayoutData(gd);
- // testSection.setText("Mapping Descriptor");
- // FillLayout flayout2 = new FillLayout();
- // testSection.setLayout(flayout2);
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.
+ * swt.events.ModifyEvent)
+ */
+ public void modifyText(ModifyEvent e) {
+ ediFileEncoding = encodingText.getText();
+ ediFilePath = ediFileText.getText();
+ final InputType[] inputType1 = new InputType[1];
+ SmooksGraphicsExtType ext = modelProvider.getSmooksGraphicsExt();
+ List<InputType> list = ext.getInput();
+ for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) {
+ InputType inputType = (InputType) iterator.next();
+ if (SmooksModelUtils.INPUT_TYPE_EDI.equals(inputType.getType())) {
+ inputType1[0] = inputType;
+ break;
+ }
+ }
- Section ediModelViewerSection = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.DESCRIPTION);
+ final Properties pro = new Properties();
+ pro.setProperty("encoding", ediFileEncoding);
+ getEditorSite().getShell().getDisplay().syncExec(new Runnable() {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Runnable#run()
+ */
+ public void run() {
+ String type = SmooksModelUtils.INPUT_TYPE_EDI;
+ SmooksGraphicsExtType extType = modelProvider.getSmooksGraphicsExt();
+ InputType input = inputType1[0];
+ if (input == null) {
+ input = GraphFactory.eINSTANCE.createInputType();
+ }
+ input.setType(type);
+ ParamType encodingParam = null;
+ List<ParamType> paramList = input.getParam();
+ for (Iterator<?> iterator = paramList.iterator(); iterator.hasNext();) {
+ ParamType paramType = (ParamType) iterator.next();
+ if ("encoding".equals(paramType.getName())) {
+ encodingParam = paramType;
+ break;
+ }
+ }
+ if (encodingParam == null) {
+ encodingParam = GraphFactory.eINSTANCE.createParamType();
+ encodingParam.setName("encoding");
+ }
+ encodingParam.setValue(ediFileEncoding);
+
+ input.getParam().add(encodingParam);
+ try {
+ extType.eResource().save(Collections.emptyMap());
+ List<ISmooksGraphChangeListener> listeners = extType.getChangeListeners();
+ for (Iterator<?> iterator = listeners.iterator(); iterator.hasNext();) {
+ ISmooksGraphChangeListener smooksGraphChangeListener = (ISmooksGraphChangeListener) iterator
+ .next();
+ smooksGraphChangeListener.saveComplete(extType);
+ }
+ } catch (IOException e) {
+ SmooksConfigurationActivator.getDefault().log(e);
+ }
+ }
+ });
+
+ }
+
+ });
+
+ Section ediModelViewerSection = toolkit.createSection(form.getBody(), Section.TITLE_BAR );
gd = new GridData(GridData.FILL_BOTH);
gd.horizontalSpan = 2;
ediModelViewerSection.setLayoutData(gd);
@@ -726,7 +815,29 @@
vgl.numColumns = 2;
viewerComposite.setLayout(vgl);
+
+ Hyperlink showTransformResultLink = toolkit.createHyperlink(viewerComposite, "Test EDI to XML transform",
+ SWT.NONE);
+ // showTransformResultLink.setVisible(false);
+ showTransformResultLink.addHyperlinkListener(new IHyperlinkListener() {
+ public void linkActivated(HyperlinkEvent e) {
+ testEDITransform();
+ }
+
+ public void linkEntered(HyperlinkEvent e) {
+
+ }
+
+ public void linkExited(HyperlinkEvent e) {
+
+ }
+
+ });
+ gd = new GridData();
+ gd.horizontalSpan = 2;
+ showTransformResultLink.setLayoutData(gd);
+
SashForm sashForm = new SashForm(viewerComposite, SWT.NONE);
gd = new GridData(GridData.FILL_BOTH);
@@ -1108,7 +1219,10 @@
File f = new File(file.getLocation().toOSString());
readerConfig.setParameter("mapping-model", f.toURI().toString());
- readerConfig.setParameter("encoding", "UTF-8");
+ if (ediFileEncoding == null || ediFileEncoding.trim().length() == 0) {
+ ediFileEncoding = "UTF-8";
+ }
+ readerConfig.setParameter("encoding", ediFileEncoding);
SmooksUtil.registerResource(readerConfig, smooks);
@@ -1121,7 +1235,8 @@
// in
// the domResult instance...
// FileInputStream stream
- smooks.filter(new StreamSource(new FileInputStream(ediFile)), domResult);
+ FileInputStream ediInputStream = new FileInputStream(ediFile);
+ smooks.filter(new StreamSource(ediInputStream), domResult);
// Get the Document object from the domResult. This is the message
// model!!!...
@@ -1134,11 +1249,13 @@
// We'll just print out the model DOM here so you can see it....
StringWriter modelWriter = new StringWriter();
XmlUtil.serialize(model, true, modelWriter);
- System.out.println(modelWriter);
+ // System.out.println(modelWriter);
EDIMappingResultDialog dialog = new EDIMappingResultDialog(getSite().getShell());
dialog.setText(modelWriter.toString());
dialog.open();
modelWriter.close();
+ ediInputStream.close();
+ model = null;
} catch (Throwable t) {
SmooksUIUtils.showErrorDialog(getEditorSite().getShell(), SmooksUIUtils.createErrorStatus(t));
} finally {
@@ -1148,18 +1265,29 @@
public void modifyText(ModifyEvent e) {
Text ediFileText = (Text) e.getSource();
ediFilePath = ediFileText.getText();
- InputType inputType1 = null;
+ final InputType[] inputType1 = new InputType[1];
SmooksGraphicsExtType ext = modelProvider.getSmooksGraphicsExt();
List<InputType> list = ext.getInput();
for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) {
InputType inputType = (InputType) iterator.next();
if (SmooksModelUtils.INPUT_TYPE_EDI.equals(inputType.getType())) {
- inputType1 = inputType;
+ inputType1[0] = inputType;
break;
}
}
- SmooksUIUtils.recordInputDataInfomation(inputType1, modelProvider.getSmooksGraphicsExt(),
- SmooksModelUtils.INPUT_TYPE_EDI, ediFilePath, null);
+ getEditorSite().getShell().getDisplay().syncExec(new Runnable() {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Runnable#run()
+ */
+ public void run() {
+ SmooksUIUtils.recordInputDataInfomation(inputType1[0], modelProvider.getSmooksGraphicsExt(),
+ SmooksModelUtils.INPUT_TYPE_EDI, ediFilePath, null);
+ }
+
+ });
rebuildEDIGraph();
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIMappingNodeEditPart.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIMappingNodeEditPart.java 2009-07-14 17:19:19 UTC (rev 16571)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIMappingNodeEditPart.java 2009-07-15 07:23:53 UTC (rev 16572)
@@ -11,6 +11,8 @@
package org.jboss.tools.smooks.edimap.editparts;
import org.jboss.tools.smooks.edimap.editor.EDITreeNodeEditPart;
+import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel;
+import org.jboss.tools.smooks.model.medi.Segment;
/**
* @author Dart (dpeng(a)redhat.com)
@@ -36,7 +38,11 @@
*/
@Override
protected boolean isDragLink() {
- return true;
+ TreeNodeModel treeNode = (TreeNodeModel)getModel();
+ if(treeNode.getData() instanceof Segment){
+ return true;
+ }
+ return false;
}
/*
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeEditPart.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeEditPart.java 2009-07-14 17:19:19 UTC (rev 16571)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeEditPart.java 2009-07-15 07:23:53 UTC (rev 16572)
@@ -68,6 +68,9 @@
* .eclipse.gef.Request)
*/
public DragTracker getDragTracker(Request request) {
+// if(true){
+// return super.getDragTracker(request);
+// }
if (isDragLink()) {
getViewer().select(this);
return new ConnectionDragCreationTool();
16 years, 9 months
JBoss Tools SVN: r16571 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-07-14 13:19:19 -0400 (Tue, 14 Jul 2009)
New Revision: 16571
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo51.gif
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
Log:
JBIDE-4610 - icons for eap and 5.1, not finished pending a few more images
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo51.gif
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo51.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2009-07-14 16:08:15 UTC (rev 16570)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2009-07-14 17:19:19 UTC (rev 16571)
@@ -43,7 +43,9 @@
public static final String WIZBAN_JBOSS40_LOGO = "jboss4.0logo"; //$NON-NLS-1$
public static final String WIZBAN_JBOSS42_LOGO = "jboss4.2logo"; //$NON-NLS-1$
public static final String WIZBAN_JBOSS50_LOGO = "jboss5.0logo"; //$NON-NLS-1$
+ public static final String WIZBAN_JBOSS51_LOGO = "jboss5.1logo"; //$NON-NLS-1$
public static final String WIZBAN_JBOSS_EAP_LOGO = "jbossEAPlogo"; //$NON-NLS-1$
+ public static final String WIZBAN_JBOSS_EAP_LOGO_50 = "jbossEAPlogo50"; //$NON-NLS-1$
public static final String WIZBAN_DEPLOY_ONLY_LOGO = "jbossdeployerlogo"; //$NON-NLS-1$
public static final String TWIDDLE_IMAGE = "TWIDDLE_IMAGE"; //$NON-NLS-1$
public static final String INACTIVE_CATEGORY_IMAGE = "INACTIVE_CATEGORY_IMAGE"; //$NON-NLS-1$
@@ -75,7 +77,9 @@
descriptors.put(WIZBAN_JBOSS40_LOGO, createImageDescriptor(pluginBundle, "/icons/logo40.gif")); //$NON-NLS-1$
descriptors.put(WIZBAN_JBOSS42_LOGO, createImageDescriptor(pluginBundle, "/icons/logo42.gif")); //$NON-NLS-1$
descriptors.put(WIZBAN_JBOSS50_LOGO, createImageDescriptor(pluginBundle, "/icons/logo50.gif")); //$NON-NLS-1$
+ descriptors.put(WIZBAN_JBOSS51_LOGO, createImageDescriptor(pluginBundle, "/icons/logo51.gif")); //$NON-NLS-1$
descriptors.put(WIZBAN_JBOSS_EAP_LOGO, createImageDescriptor(pluginBundle, "/icons/logoEAP.gif")); //$NON-NLS-1$
+ descriptors.put(WIZBAN_JBOSS_EAP_LOGO_50, createImageDescriptor(pluginBundle, "/icons/logoEAP50.gif")); //$NON-NLS-1$
descriptors.put(WIZBAN_DEPLOY_ONLY_LOGO, createImageDescriptor(pluginBundle, "/icons/blank.gif")); //$NON-NLS-1$
descriptors.put(TWIDDLE_IMAGE, createImageDescriptor(pluginBundle, "icons/twiddle.gif")); //$NON-NLS-1$
descriptors.put(INACTIVE_CATEGORY_IMAGE, createImageDescriptor(pluginBundle, "/icons/inactiveCat.gif")); //$NON-NLS-1$
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-07-14 16:08:15 UTC (rev 16570)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-07-14 17:19:19 UTC (rev 16571)
@@ -173,8 +173,12 @@
imageKey = JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO;
else if (id.equals(IJBossToolingConstants.AS_50))
imageKey = JBossServerUISharedImages.WIZBAN_JBOSS50_LOGO;
+ else if (id.equals(IJBossToolingConstants.AS_51))
+ imageKey = JBossServerUISharedImages.WIZBAN_JBOSS51_LOGO;
else if (id.equals(IJBossToolingConstants.EAP_43))
imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO;
+ else if (id.equals(IJBossToolingConstants.EAP_50))
+ imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO;
return JBossServerUISharedImages.getImageDescriptor(imageKey);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-07-14 16:08:15 UTC (rev 16570)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-07-14 17:19:19 UTC (rev 16571)
@@ -104,6 +104,7 @@
else if( id.equals(IConstants.AS_40)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS40_LOGO;
else if( id.equals(IConstants.AS_42)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO;
else if( id.equals(IConstants.AS_50)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS50_LOGO;
+ else if( id.equals(IConstants.AS_51)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS51_LOGO;
else if( id.equals(IConstants.EAP_43)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO;
else if( id.equals(IConstants.EAP_50)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO;
16 years, 9 months
JBoss Tools SVN: r16570 - in trunk/smooks: tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-07-14 12:08:15 -0400 (Tue, 14 Jul 2009)
New Revision: 16570
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMappingResultDialog.java
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/ParseConfigFileTestCase.java
Log:
JBIDE-4592
Add EDI mapping transform result dialog
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java 2009-07-14 15:53:36 UTC (rev 16569)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java 2009-07-14 16:08:15 UTC (rev 16570)
@@ -27,7 +27,6 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.draw2d.ColorConstants;
import org.eclipse.draw2d.geometry.Point;
@@ -58,7 +57,6 @@
import org.eclipse.gef.ui.actions.UpdateAction;
import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler;
import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
-import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -91,7 +89,6 @@
import org.eclipse.ui.forms.widgets.Section;
import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.ModelPanelCreator;
-import org.jboss.tools.smooks.configuration.editors.uitls.ProjectClassLoader;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
import org.jboss.tools.smooks.configuration.editors.xml.TagList;
import org.jboss.tools.smooks.configuration.editors.xml.TagObject;
@@ -196,6 +193,8 @@
descriptionCreator.markPropertyUI(modelProvider.getDiagnosticList());
}
if (segmentsCreator != null) {
+ if (getGraphicalViewer() == null)
+ return;
IStructuredSelection selection = (IStructuredSelection) getGraphicalViewer().getSelection();
if (selection.size() > 1)
return;
@@ -544,7 +543,7 @@
this.description = root.getEdimap().getDescription();
this.segments = root.getEdimap().getSegments();
- if(segments.getXmltag() == null){
+ if (segments.getXmltag() == null) {
segments.setXmltag("root");
}
@@ -633,7 +632,7 @@
}
Hyperlink showTransformResultLink = toolkit.createHyperlink(desciptorContainer, "Test EDI transform", SWT.NONE);
- showTransformResultLink.setVisible(false);
+ // showTransformResultLink.setVisible(false);
showTransformResultLink.addHyperlinkListener(new IHyperlinkListener() {
/*
@@ -1073,7 +1072,6 @@
}
protected void testEDITransform() {
- ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
try {
if (this.getEditor().isDirty()) {
MessageDialog.openInformation(getEditorSite().getShell(), "Info",
@@ -1097,17 +1095,19 @@
return;
}
- IPath path1 = file.getFullPath().removeFirstSegments(1);
+ // IPath path1 = file.getFullPath().removeFirstSegments(1);
- ProjectClassLoader classLoader = new ProjectClassLoader(JavaCore.create(file.getProject()));
-
- Thread.currentThread().setContextClassLoader(classLoader);
+ // ProjectClassLoader classLoader = new
+ // ProjectClassLoader(JavaCore.create(file.getProject()));
+ //
+ // Thread.currentThread().setContextClassLoader(classLoader);
Smooks smooks = new Smooks();
SmooksResourceConfiguration readerConfig = new SmooksResourceConfiguration("org.xml.sax.driver",
SmooksEDIReader.class.getName());
+ File f = new File(file.getLocation().toOSString());
- readerConfig.setParameter("mapping-model", path1.toString());
+ readerConfig.setParameter("mapping-model", f.toURI().toString());
readerConfig.setParameter("encoding", "UTF-8");
SmooksUtil.registerResource(readerConfig, smooks);
@@ -1120,6 +1120,7 @@
// Filter the message through Smooks and capture the result as a DOM
// in
// the domResult instance...
+ // FileInputStream stream
smooks.filter(new StreamSource(new FileInputStream(ediFile)), domResult);
// Get the Document object from the domResult. This is the message
@@ -1134,10 +1135,13 @@
StringWriter modelWriter = new StringWriter();
XmlUtil.serialize(model, true, modelWriter);
System.out.println(modelWriter);
+ EDIMappingResultDialog dialog = new EDIMappingResultDialog(getSite().getShell());
+ dialog.setText(modelWriter.toString());
+ dialog.open();
+ modelWriter.close();
} catch (Throwable t) {
SmooksUIUtils.showErrorDialog(getEditorSite().getShell(), SmooksUIUtils.createErrorStatus(t));
} finally {
- Thread.currentThread().setContextClassLoader(oldClassLoader);
}
}
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMappingResultDialog.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMappingResultDialog.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMappingResultDialog.java 2009-07-14 16:08:15 UTC (rev 16570)
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.edimap.editor;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.window.IShellProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * @author Dart (dpeng(a)redhat.com)
+ *
+ */
+public class EDIMappingResultDialog extends Dialog {
+
+ private Text text;
+
+ public EDIMappingResultDialog(IShellProvider parentShell) {
+ super(parentShell);
+ // TODO Auto-generated constructor stub
+ }
+
+ public EDIMappingResultDialog(Shell parentShell) {
+ super(parentShell);
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse
+ * .swt.widgets.Composite)
+ */
+ @Override
+ protected void createButtonsForButtonBar(Composite parent) {
+ createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets
+ * .Composite)
+ */
+ @Override
+ protected Control createDialogArea(Composite parent) {
+ // TODO Auto-generated method stub
+ Composite mainComposite = (Composite) super.createDialogArea(parent);
+ org.eclipse.swt.layout.GridData gd = new GridData(GridData.FILL_BOTH);
+
+ text = new Text(mainComposite, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.READ_ONLY | SWT.BORDER);
+ gd.heightHint = 400;
+ gd.widthHint = 400;
+ text.setLayoutData(gd);
+ if (content != null) {
+ text.setText(content);
+ }
+ this.getShell().setText("EDI Mapping Result");
+ return mainComposite;
+ }
+
+ private String content = null;
+
+ public void setText(String content) {
+ this.content = content;
+ }
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMappingResultDialog.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/ParseConfigFileTestCase.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/ParseConfigFileTestCase.java 2009-07-14 15:53:36 UTC (rev 16569)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/ParseConfigFileTestCase.java 2009-07-14 16:08:15 UTC (rev 16570)
@@ -46,7 +46,7 @@
}
private void loadFile(File file) throws IOException {
- if (file.exists() && file.isDirectory()) {
+ if (file.exists() && file.isDirectory() && !file.getName().equals(".svn")) {
File[] configFiles = file.listFiles();
for (int i = 0; i < configFiles.length; i++) {
File configFile = configFiles[i];
16 years, 9 months
JBoss Tools SVN: r16569 - trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools.
by jbosstools-commits＠lists.jboss.org
Author: chukhutsina
Date: 2009-07-14 11:53:36 -0400 (Tue, 14 Jul 2009)
New Revision: 16569
Modified:
trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-770- Fixed the problem with two superfluous title pages in com guides.</p>
</body></html>
Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl
===================================================================
--- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl 2009-07-14 15:47:13 UTC (rev 16568)
+++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl 2009-07-14 15:53:36 UTC (rev 16569)
@@ -13,13 +13,15 @@
<!-- overwriting links properties -->
<xsl:param name="ulink.show" select="0"></xsl:param>
-
+ <xsl:template name="book.titlepage.separator"/>
+ <xsl:template name="book.titlepage.verso"/>
+ <xsl:template name="book.titlepage3.recto"/>
<xsl:attribute-set name="header.content.properties">
<xsl:attribute name="font-family">Helvetica</xsl:attribute>
<xsl:attribute name="font-size">9pt</xsl:attribute>
<xsl:attribute name="font-weight">bold</xsl:attribute>
-
</xsl:attribute-set>
+
<xsl:template name="header.content">
<xsl:param name="pageclass" select="''"/>
<xsl:param name="sequence" select="''"/>
@@ -478,5 +480,5 @@
<xsl:otherwise>auto</xsl:otherwise>
</xsl:choose>
</xsl:template>
-
-</xsl:stylesheet>
+
+ </xsl:stylesheet>
16 years, 9 months
JBoss Tools SVN: r16568 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-14 11:47:13 -0400 (Tue, 14 Jul 2009)
New Revision: 16568
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1826
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-07-14 13:55:37 UTC (rev 16567)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-07-14 15:47:13 UTC (rev 16568)
@@ -437,7 +437,7 @@
*
* @return
*/
- protected String[] getParentTags(boolean includeThisTag) {
+ public String[] getParentTags(boolean includeThisTag) {
List<String> parentTags = new ArrayList<String>();
IStructuredModel sModel = StructuredModelManager
@@ -542,7 +542,7 @@
* Returns URI for the current/parent tag
* @return
*/
- protected String getTagPrefix() {
+ public String getTagPrefix() {
IStructuredModel sModel = StructuredModelManager
.getModelManager()
.getExistingModelForRead(getDocument());
@@ -585,7 +585,7 @@
* Returns URI for the current/parent tag
* @return
*/
- protected String getTagUri() {
+ public String getTagUri() {
String nodePrefix = getTagPrefix();
return getUri(nodePrefix);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2009-07-14 13:55:37 UTC (rev 16567)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2009-07-14 15:47:13 UTC (rev 16568)
@@ -18,6 +18,7 @@
import org.eclipse.jface.fieldassist.IContentProposal;
import org.eclipse.jface.fieldassist.IContentProposalProvider;
import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jst.jsp.ui.internal.contentassist.JSPContentAssistProcessor;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IEditorPart;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
@@ -33,6 +34,7 @@
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.jsp.contentassist.AbstractXMLContentAssistProcessor.TextRegion;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.jst.jsp.outline.ValueHelper;
import org.jboss.tools.jst.jsp.outline.cssdialog.common.Constants;
import org.jboss.tools.jst.web.kb.IPageContext;
import org.jboss.tools.jst.web.kb.KbQuery;
@@ -50,7 +52,7 @@
String attributeName;
String nodeName;
int offset = 0;
- JSPDialogContentAssistProcessor processor;
+ JspContentAssistProcessor processor;
IPageContext pageContext = null;
public JSPDialogContentProposalProvider() {}
@@ -61,11 +63,19 @@
nodeName = Constants.EMPTY + context.getProperty("nodeName");
Node node = (Node)context.get("node");
if (node instanceof IDOMElement) {
- offset = ((IDOMElement)node).getStartEndOffset(); //approximation, attribute may be not defined
+ offset = ((IDOMElement)node).getStartOffset() + ("" + nodeName).length(); //approximation, attribute may be not defined
+ } else if(context.get("offset") != null) {
+ offset = ((Integer)context.get("offset")).intValue();
}
- processor = new JSPDialogContentAssistProcessor();
+ ValueHelper valueHelper = (ValueHelper)context.get("valueHelper");
+ if(valueHelper == null) {
+ valueHelper = new ValueHelper();
+ }
+ processor = valueHelper.isFacetets() ? new FaceletPageContectAssistProcessor() : new JspContentAssistProcessor();
processor.computeCompletionProposals(getTextViewer(), offset);
pageContext = processor.getContext();
+ context.put("pageContext", pageContext);
+ context.put("kbQuery", createKbQuery(Type.ATTRIBUTE_VALUE, "", "", offset, false));
}
public IContentProposal[] getProposals(String contents, int position) {
@@ -84,7 +94,7 @@
int beginChangeOffset = prefix.getStartOffset() + prefix.getOffset();
- KbQuery kbQuery = createKbQuery(Type.ATTRIBUTE_VALUE, query, stringQuery, position);
+ KbQuery kbQuery = createKbQuery(Type.ATTRIBUTE_VALUE, query, stringQuery, position, true);
TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, pageContext);
if(proposals != null) for (TextProposal textProposal: proposals) {
@@ -189,48 +199,44 @@
return null;
}
- protected KbQuery createKbQuery(Type type, String query, String stringQuery, int pos) {
+ protected KbQuery createKbQuery(Type type, String query, String stringQuery, int pos, boolean addAttr) {
KbQuery kbQuery = new KbQuery();
- String prefix = processor.getTagPrefix();
- String uri = processor.getTagUri();
- String[] parentTags = processor.getParentTags(attributeName);
- String parent = attributeName;
- String queryValue = query;
- String queryStringValue = stringQuery;
-
- kbQuery.setPrefix(prefix);
- kbQuery.setUri(uri);
+ String[] parentTags = processor.getParentTags(false);
+ parentTags = add(parentTags, nodeName);
+ if(addAttr) {
+ parentTags = add(parentTags, attributeName);
+ }
+ kbQuery.setPrefix(getPrefix());
+ kbQuery.setUri(processor.getUri(getPrefix()));
kbQuery.setParentTags(parentTags);
- kbQuery.setParent(parent);
+ kbQuery.setParent(attributeName);
kbQuery.setMask(true);
kbQuery.setType(type);
kbQuery.setOffset(pos);
- kbQuery.setValue(queryValue);
- kbQuery.setStringQuery(queryStringValue);
+ kbQuery.setValue(query);
+ kbQuery.setStringQuery(stringQuery);
return kbQuery;
}
- protected int getOffset() {
- return offset;
+ private String getPrefix() {
+ if(nodeName == null) return null;
+ int i = nodeName.indexOf(':');
+ return i < 0 ? null : nodeName.substring(0, i);
}
- static class JSPDialogContentAssistProcessor extends JspContentAssistProcessor {
- public String getTagPrefix() {
- return super.getTagPrefix();
- }
- public String getTagUri() {
- return super.getTagUri();
- }
- protected String[] getParentTags(String attr) {
- String[] result = super.getParentTags(true);
- String[] result1 = new String[result.length + 1];
- System.arraycopy(result, 0, result1, 0, result.length);
- result1[result.length] = attr;
- return result1;
- }
+ protected String[] getParentTags(JspContentAssistProcessor processor) {
+ String[] result = processor.getParentTags(true);
+ String[] result1 = add(result, attributeName);
+ return result1;
+ }
+ private String[] add(String[] result, String v) {
+ String[] result1 = new String[result.length + 1];
+ System.arraycopy(result, 0, result1, 0, result.length);
+ result1[result.length] = v;
+ return result1;
}
}
16 years, 9 months
JBoss Tools SVN: r16567 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-14 09:55:37 -0400 (Tue, 14 Jul 2009)
New Revision: 16567
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1826
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java 2009-07-14 13:42:13 UTC (rev 16566)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java 2009-07-14 13:55:37 UTC (rev 16567)
@@ -16,12 +16,14 @@
import java.util.List;
import java.util.Properties;
+import org.eclipse.jface.text.TextSelection;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ColumnPixelData;
import org.eclipse.jface.viewers.ICellEditorListener;
import org.eclipse.jface.viewers.ICellModifier;
import org.eclipse.jface.viewers.IElementComparer;
import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -263,6 +265,11 @@
tagName = prefix + ":" + tagName; //$NON-NLS-1$
}
context.setProperty("nodeName", tagName); //$NON-NLS-1$
+ ISelection s = fWizardModel.getDropData().getSelectionProvider().getSelection();
+ if (s instanceof TextSelection) {
+ int offset = ((TextSelection)s).getOffset();
+ context.put("offset", new Integer(offset));
+ }
return attrDescr.getValue()==null?"":attrDescr.getValue(); //$NON-NLS-1$
}
16 years, 9 months
JBoss Tools SVN: r16566 - trunk/jsf/docs/userguide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-07-14 09:42:13 -0400 (Tue, 14 Jul 2009)
New Revision: 16566
Modified:
trunk/jsf/docs/userguide/en/modules/editors.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-782 - updating the VPE section according to the changes in the VPE;
Modified: trunk/jsf/docs/userguide/en/modules/editors.xml
===================================================================
--- trunk/jsf/docs/userguide/en/modules/editors.xml 2009-07-14 13:39:43 UTC (rev 16565)
+++ trunk/jsf/docs/userguide/en/modules/editors.xml 2009-07-14 13:42:13 UTC (rev 16566)
@@ -997,7 +997,8 @@
<para>In the Visual part of the <property>VPE</property> there is a graphical
toolbar, use it to add inline styling to JSF and Struts tags on your page. The
- toolbar can be hidden by clicking on arrow sign in the upper left corner.</para>
+ toolbar can be hidden by selecting the <emphasis>
+ <property>Hide Text Formatting</property></emphasis> option in the submenu on the left pane.</para>
<figure>
<title>Text Formatting</title>
@@ -1008,8 +1009,8 @@
</mediaobject>
</figure>
- <para>For editing inline styles for DOM elements <property>VPE</property> also
- provides <property>CSS Dialog</property>. It can be called from <emphasis>
+ <para>For editing inline styles for DOM elements <property>VPE</property>
+ provides the <property>CSS Dialog</property>. It can be called from <emphasis>
<property>style</property>
</emphasis> line in the <property>Properties view</property> for a currently
selected element.</para>
@@ -1636,8 +1637,17 @@
<para>If you want to hide the <property>Selection Tag Bar</property>, use the button in
the form of a red cross on the lower right side. To reset it again you should check
- the proper option in the <link linkend="vpe_preferences">VPE
- Preferences</link>.</para>
+ the <emphasis>
+ <property>Show Selection Bar</property></emphasis> option in the submenu on the left pane.</para>
+
+ <figure>
+ <title>Show the Selection Tag Bar</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/show_selection_bar.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
</section>
<section id="page_preview">
@@ -1783,8 +1793,8 @@
<para><property>The Properties editor</property> allows you to work in two different
modes and also supports unicode characters.</para>
- <para>To create a new properties file, in the Package Explorer view, select<emphasis>
- <property> New > Properties File</property>
+ <para>To create a new properties file, in the Package Explorer view, select <emphasis>
+ <property>New > Properties File</property>
</emphasis> from the right-click context menu on the folder where you want to create
the file.</para>
<figure>
16 years, 9 months
JBoss Tools SVN: r16565 - trunk/jsf/docs/userguide/en/images/visual_page.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-07-14 09:39:43 -0400 (Tue, 14 Jul 2009)
New Revision: 16565
Modified:
trunk/jsf/docs/userguide/en/images/visual_page/source_bottom.png
trunk/jsf/docs/userguide/en/images/visual_page/source_left.png
trunk/jsf/docs/userguide/en/images/visual_page/source_right.png
trunk/jsf/docs/userguide/en/images/visual_page/source_top.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_1.png
Log:
https://jira.jboss.org/jira/browse/JBDS-782 - updating the images;
Modified: trunk/jsf/docs/userguide/en/images/visual_page/source_bottom.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/source_left.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/source_right.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/source_top.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_1.png
===================================================================
(Binary files differ)
16 years, 9 months
JBoss Tools SVN: r16564 - trunk/jsf/docs/userguide/en/images/visual_page.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-07-14 09:39:00 -0400 (Tue, 14 Jul 2009)
New Revision: 16564
Modified:
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_12.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_14.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_15.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_2.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_23a.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_23b.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_24.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_25.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_3.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4a.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4b.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4c.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_5.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_7a.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_8.png
Log:
https://jira.jboss.org/jira/browse/JBDS-782 - updating the images according to the new icons added to the VPE;
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_12.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_14.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_15.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_2.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_23a.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_23b.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_24.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_25.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_3.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4a.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4b.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4c.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_5.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_7a.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_8.png
===================================================================
(Binary files differ)
16 years, 9 months