Revision: 3396
http://vexi.svn.sourceforge.net/vexi/?rev=3396&view=rev
Author: mkpg2
Date: 2009-03-04 03:55:19 +0000 (Wed, 04 Mar 2009)
Log Message:
-----------
Fix, saving project path was broken.
Modified Paths:
--------------
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/editor/VexiEditor.java
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/ui/projectprops/DependenciesPage.java
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/ui/projectprops/ProjectPathsBlock.java
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/ui/projectprops/SourcePage.java
Modified:
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/editor/VexiEditor.java
===================================================================
--- trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/editor/VexiEditor.java
2009-03-04 02:18:07 UTC (rev 3395)
+++ trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/editor/VexiEditor.java
2009-03-04 03:55:19 UTC (rev 3396)
@@ -12,7 +12,6 @@
import org.eclipse.jface.text.TextSelection;
import org.eclipse.jface.text.source.DefaultCharacterPairMatcher;
import org.eclipse.jface.text.source.MatchingCharacterPainter;
-import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IEditorPart;
Modified:
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/ui/projectprops/DependenciesPage.java
===================================================================
---
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/ui/projectprops/DependenciesPage.java
2009-03-04 02:18:07 UTC (rev 3395)
+++
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/ui/projectprops/DependenciesPage.java
2009-03-04 03:55:19 UTC (rev 3396)
@@ -10,10 +10,10 @@
public class DependenciesPage extends ProjectPathPage{
IProject project;
- protected DependenciesPage(IProject project) {
+ protected DependenciesPage(IProject project, VexiProject vproj) {
super(
(IWorkspaceRoot) project.getParent(),
- ((VexiProject)project.getAdapter(VexiProject.class)).projects
+ vproj.projects
);
this.project = project;
}
Modified:
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/ui/projectprops/ProjectPathsBlock.java
===================================================================
---
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/ui/projectprops/ProjectPathsBlock.java
2009-03-04 02:18:07 UTC (rev 3395)
+++
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/ui/projectprops/ProjectPathsBlock.java
2009-03-04 03:55:19 UTC (rev 3396)
@@ -15,6 +15,7 @@
import org.eclipse.swt.widgets.Widget;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.ide.IDE;
+import org.vexi.vexidev.VexiProject;
import org.vexi.vexidev.VexidevPlugin;
public class ProjectPathsBlock {
@@ -56,7 +57,11 @@
//item.setText(NewWizardMessages.BuildPathsBlock_tab_source);
//item.setImage(JavaPluginImages.get(JavaPluginImages.IMG_OBJS_PACKFRAG_ROOT));
- sourcePage = new SourcePage(project);
+ // REMARK - not sure but perhaps VexiProject is a bad
adaptable(?), because it has state
+ // so can't have 2 different instances being used in parallel.
In anycase important here
+ // that get one here and then share it between the pages
+ VexiProject vproj =
((VexiProject)project.getAdapter(VexiProject.class));
+ sourcePage = new SourcePage(project,vproj);
item= new TabItem(folder, SWT.NONE);
item.setText("Source");
item.setImage(sharedImages.getImage(ISharedImages.IMG_OBJ_FOLDER));
@@ -68,7 +73,7 @@
Image projectImage=
sharedImages.getImage(IDE.SharedImages.IMG_OBJ_PROJECT);
- projectsPage = new DependenciesPage(project);
+ projectsPage = new DependenciesPage(project,vproj);
item= new TabItem(folder, SWT.NONE);
item.setText("Projects");
//item.setText(NewWizardMessages.BuildPathsBlock_tab_projects);
Modified:
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/ui/projectprops/SourcePage.java
===================================================================
---
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/ui/projectprops/SourcePage.java
2009-03-04 02:18:07 UTC (rev 3395)
+++
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/ui/projectprops/SourcePage.java
2009-03-04 03:55:19 UTC (rev 3396)
@@ -45,10 +45,10 @@
Button addLibrary = null;
IProject project;
- protected SourcePage(IProject project) {
+ protected SourcePage(IProject project, VexiProject vproj) {
super(
(IWorkspaceRoot) project.getParent(),
-
((VexiProject)project.getAdapter(VexiProject.class)).sources
+ vproj.sources
);
this.project = project;
this.tableCaption = "Configure source folders";
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
