[jbosstools-commits] JBoss Tools SVN: r31482 - trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/dialog/tabs.
Author: dgolovin
Date: 2011-05-25 13:14:34 -0400 (Wed, 25 May 2011)
New Revision: 31482
Modified:
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/dialog/tabs/BaseTabControl.java
Log:
https://issues.jboss.org/browse/JBIDE-9003 Background image path not calculated when using
image dialog from css property view
modified patch applied to trunk
Modified:
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/dialog/tabs/BaseTabControl.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/dialog/tabs/BaseTabControl.java 2011-05-25
16:51:44 UTC (rev 31481)
+++
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/dialog/tabs/BaseTabControl.java 2011-05-25
17:14:34 UTC (rev 31482)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.jst.css.dialog.tabs;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -19,6 +20,7 @@
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.resource.JFaceResources;
@@ -41,6 +43,9 @@
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.swt.widgets.Widget;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.model.WorkbenchContentProvider;
import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.jboss.tools.jst.css.CSSPlugin;
@@ -59,6 +64,7 @@
import org.jboss.tools.jst.jsp.messages.JstUIMessages;
import org.jboss.tools.jst.jsp.util.Constants;
+
/**
* This is base tab control component that should be re-implemented by
* successor.
@@ -253,10 +259,18 @@
dialog.setInput(project);
if (dialog.open() == ImageSelectionDialog.OK) {
- IFile file = (IFile) dialog.getFirstResult();
- String value = file.getFullPath().toString();
- combo.add(value);
- combo.setText(value);
+ IFile imageFile = (IFile) dialog.getFirstResult();
+ IWorkbenchPage page = CSSPlugin.getDefault().getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage();
+ if (page != null
+ && page.getActiveEditor() != null
+ && page.getActiveEditor().getEditorInput() instanceof IFileEditorInput )
{
+ IEditorInput input = page.getActiveEditor().getEditorInput();
+ IFile pageFile = ((IFileEditorInput) input).getFile();
+ String relativePath = BaseTabControl.computeRelativePath(pageFile, imageFile);
+ combo.add(relativePath);
+ combo.setText(relativePath);
+ }
}
}
});
@@ -280,6 +294,31 @@
return wrapper;
}
+ /**
+ * Build a relative path to the given base path.
+ *
+ * @param base
+ * - the path used as the base
+ * @param path
+ * - the path to compute relative to the base path
+ * @return A relative path from base to path
+ */
+
+ private static String computeRelativePath(IFile baseFile, IFile otherFile) {
+
+ IPath basePath = baseFile.getLocation();
+ IPath otherPath = otherFile.getLocation();
+
+ String relativePath = otherPath.makeRelativeTo(basePath).toPortableString();
+
+ if (relativePath.startsWith("..")) {
+ relativePath = relativePath.replaceFirst("..", ".");
+ }
+
+ return relativePath;
+ }
+
+
protected Composite createWrapperComposite(Composite parent) {
Composite wrapper = new Composite(parent, SWT.None);
GridLayout layout = new GridLayout(COMPOSITE_NUM_COLUMNS, false);