Revision: 3131
http://vexi.svn.sourceforge.net/vexi/?rev=3131&view=rev
Author: mkpg2
Date: 2008-10-18 01:47:06 +0000 (Sat, 18 Oct 2008)
Log Message:
-----------
Release. Vexidev 0.3.0
- final fixes
Modified Paths:
--------------
trunk/tools/org.vexi.vexidev/META-INF/MANIFEST.MF
trunk/tools/org.vexi.vexidev/plugin.xml
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/VexiModelSorter.java
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/elements/IVexiResource.java
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/elements/VexiPackage.java
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/elements/VexiSourceFolder.java
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/elements/WrappedResource.java
trunk/tools/org.vexi.vexidev-feature/feature.xml
trunk/tools/updatesite/site.xml
Property Changed:
----------------
trunk/tools/updatesite/
trunk/tools/updatesite/features/
trunk/tools/updatesite/plugins/
Modified: trunk/tools/org.vexi.vexidev/META-INF/MANIFEST.MF
===================================================================
--- trunk/tools/org.vexi.vexidev/META-INF/MANIFEST.MF 2008-10-18 01:32:00 UTC
(rev 3130)
+++ trunk/tools/org.vexi.vexidev/META-INF/MANIFEST.MF 2008-10-18 01:47:06 UTC
(rev 3131)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Vexidev Plug-in
Bundle-SymbolicName: org.vexi.vexidev; singleton:=true
-Bundle-Version: 0.2.1
+Bundle-Version: 0.3.0
Bundle-Activator: org.vexi.vexidev.VexidevPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.resources,
Modified: trunk/tools/org.vexi.vexidev/plugin.xml
===================================================================
--- trunk/tools/org.vexi.vexidev/plugin.xml 2008-10-18 01:32:00 UTC (rev
3130)
+++ trunk/tools/org.vexi.vexidev/plugin.xml 2008-10-18 01:47:06 UTC (rev
3131)
@@ -89,6 +89,11 @@
<filter
value="org.vexi.vexidev.vexiNature"
name="projectNature"/>
+ <!--<enabledWhen>
+ <instanceof
+ value="org.eclipse.core.resources.IProject">
+ </instanceof>
+ </enabledWhen>-->
</page>
</extension>
<extension
@@ -212,9 +217,28 @@
</category>
</extension>
+ <!-- ####################################################
+ ####################### PERSPECTIVE #######################
+ ############################################## -->
+ <!--
+ <extension point="org.eclipse.ui.perspectives">
+ <perspective
+ class="org.python.pydev.ui.perspective.PythonPerspectiveFactory"
+ icon="icons/python_16x16.png"
+ id="org.python.pydev.ui.PythonPerspective"
+ name="Pydev"/>
+ </extension>
+ <extension point="org.eclipse.ui.perspectiveExtensions">
+ <perspectiveExtension targetID="org.python.pydev.ui.PythonPerspective">
+ <showInPart id="org.eclipse.ui.views.ResourceNavigator"/>
+ <showInPart id="org.python.pydev.navigator.view"/>
+ <showInPart id="org.eclipse.ui.views.ContentOutline"/>
+ </perspectiveExtension>
+ </extension>-->
+
<!-- ##############################################
- ####################### VIEWER #######################
+ ####################### EXPLORER #######################
############################################## -->
<extension
Modified:
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/VexiModelSorter.java
===================================================================
---
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/VexiModelSorter.java
2008-10-18 01:32:00 UTC (rev 3130)
+++
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/VexiModelSorter.java
2008-10-18 01:47:06 UTC (rev 3131)
@@ -8,6 +8,7 @@
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter;
import org.vexi.vexidev.navigator.elements.IVexiResource;
+import org.vexi.vexidev.navigator.elements.VexiPackage;
public class VexiModelSorter extends ViewerSorter{
@@ -19,7 +20,14 @@
IVexiResource resource2 = (IVexiResource) e2;
int r1 = resource1.getRank();
int r2 = resource2.getRank();
- if(r1 == r2){
+ if(r1 == IVexiResource.RANK_PACKAGE){
+ assert(r1==r2);
+ VexiPackage p1 = (VexiPackage)resource1;
+ VexiPackage p2 = (VexiPackage)resource2;
+ p1.getName().compareTo(p2.getName());
+
+ }else if(r1 == r2){
+
return super.compare(viewer, resource1.getActualObject(),
resource2.getActualObject());
}else if(r1 < r2){
return -1;
Modified:
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/elements/IVexiResource.java
===================================================================
---
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/elements/IVexiResource.java
2008-10-18 01:32:00 UTC (rev 3130)
+++
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/elements/IVexiResource.java
2008-10-18 01:47:06 UTC (rev 3131)
@@ -11,10 +11,7 @@
public interface IVexiResource extends IAdaptable {
int RANK_SOURCE_FOLDER = 0;
- int RANK_PYTHON_FOLDER = 1;
- int RANK_PYTHON_FILE = 2;
- int RANK_PYTHON_RESOURCE = 3;
- int RANK_PYTHON_NODE = 4;
+ int RANK_PACKAGE = 1;
/**
* @return the parent for this resource
Modified:
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/elements/VexiPackage.java
===================================================================
---
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/elements/VexiPackage.java
2008-10-18 01:32:00 UTC (rev 3130)
+++
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/elements/VexiPackage.java
2008-10-18 01:47:06 UTC (rev 3131)
@@ -4,22 +4,22 @@
public class VexiPackage extends WrappedResource<IFolder> {
+ final String name;
public VexiPackage(Object parentElement,
IFolder actualObject,
VexiSourceFolder pythonSourceFolder) {
super(parentElement, actualObject, pythonSourceFolder, 2);
- }
-
- public String getName() {
String r = actualObject.getName();
if(parentElement instanceof VexiPackage){
r = ((VexiPackage)parentElement).getName()+"."+r;
}
- return r;
+ name = r;
}
+
+ public String getName() { return name; }
- public String toString() {
- return getName();
- }
+ public int getRank() { return RANK_PACKAGE; }
+
+ public String toString() { return getName(); }
}
Modified:
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/elements/VexiSourceFolder.java
===================================================================
---
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/elements/VexiSourceFolder.java
2008-10-18 01:32:00 UTC (rev 3130)
+++
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/elements/VexiSourceFolder.java
2008-10-18 01:47:06 UTC (rev 3131)
@@ -116,7 +116,7 @@
public int getRank() {
- return IVexiResource.RANK_SOURCE_FOLDER;
+ return RANK_SOURCE_FOLDER;
}
Modified:
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/elements/WrappedResource.java
===================================================================
---
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/elements/WrappedResource.java
2008-10-18 01:32:00 UTC (rev 3130)
+++
trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/navigator/elements/WrappedResource.java
2008-10-18 01:47:06 UTC (rev 3131)
@@ -11,7 +11,7 @@
*
* @param <X>
*/
-public class WrappedResource<X extends IResource> implements IVexiResource,
IContributorResourceAdapter, IAdaptable{
+abstract public class WrappedResource<X extends IResource> implements
IVexiResource, IContributorResourceAdapter, IAdaptable{
protected Object parentElement;
protected X actualObject;
@@ -37,10 +37,6 @@
public VexiSourceFolder getSourceFolder() {
return pythonSourceFolder;
}
-
- public int getRank() {
- return rank;
- }
public IResource getAdaptedResource(IAdaptable adaptable) {
return (IResource) getActualObject();
Modified: trunk/tools/org.vexi.vexidev-feature/feature.xml
===================================================================
--- trunk/tools/org.vexi.vexidev-feature/feature.xml 2008-10-18 01:32:00 UTC
(rev 3130)
+++ trunk/tools/org.vexi.vexidev-feature/feature.xml 2008-10-18 01:47:06 UTC
(rev 3131)
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.vexi.vexidev_feature"
- label="org.vexi.vexidev-feature"
- version="0.2.0"
- provider-name="[EMAIL PROTECTED]">
-
- <description>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.vexi.vexidev_feature"
+ label="org.vexi.vexidev-feature"
+ version="0.3.0"
+ provider-name="[EMAIL PROTECTED]">
+
+ <description>
Vexi Development plugin
- syntax highlighting (with preferences)
- vexi projects with vexi paths
- launch configurations
- - code formatting
- </description>
-
- <copyright>
- Copyrighted by Mike Goodwin 2005
- </copyright>
-
- <license>
- This plugin is licensed under the terms of the Eclipse Public License
- </license>
-
- <url>
- <update label="VexiDev updates"
url="http://vexi.sourceforge.net/vexidev/updatesite"/>
- </url>
-
- <requires>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.jface"/>
- <import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.debug.core"/>
- <import plugin="org.eclipse.debug.ui"/>
- <import plugin="org.eclipse.ui.console"/>
- <import plugin="org.eclipse.ui.editors"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.ui.workbench.texteditor"/>
- <import plugin="org.eclipse.core.expressions"/>
- </requires>
-
- <plugin
- id="org.vexi.vexidev"
- download-size="128"
- install-size="189"
- version="0.0.0"/>
-
-</feature>
+ - code formatting
+ </description>
+
+ <copyright>
+ Copyrighted by Mike Goodwin 2005
+ </copyright>
+
+ <license>
+ This plugin is licensed under the terms of the Eclipse Public License
+ </license>
+
+ <url>
+ <update label="VexiDev updates"
url="http://vexi.sourceforge.net/vexidev/updatesite"/>
+ </url>
+
+ <requires>
+ <import plugin="org.eclipse.core.resources"/>
+ <import plugin="org.eclipse.core.runtime"/>
+ <import plugin="org.eclipse.jface"/>
+ <import plugin="org.eclipse.jface.text"/>
+ <import plugin="org.eclipse.ui"/>
+ <import plugin="org.eclipse.debug.core"/>
+ <import plugin="org.eclipse.debug.ui"/>
+ <import plugin="org.eclipse.ui.console"/>
+ <import plugin="org.eclipse.ui.editors"/>
+ <import plugin="org.eclipse.ui.ide"/>
+ <import plugin="org.eclipse.ui.workbench.texteditor"/>
+ <import plugin="org.eclipse.core.expressions"/>
+ </requires>
+
+ <plugin
+ id="org.vexi.vexidev"
+ download-size="128"
+ install-size="189"
+ version="0.0.0"/>
+
+</feature>
Property changes on: trunk/tools/updatesite
___________________________________________________________________
Added: svn:ignore
+ artifacts.xml
content.xml
Property changes on: trunk/tools/updatesite/features
___________________________________________________________________
Added: svn:ignore
+ org.vexi.vexidev_feature_0.3.0.jar
Property changes on: trunk/tools/updatesite/plugins
___________________________________________________________________
Added: svn:ignore
+ org.vexi.vexidev_0.3.0.jar
Modified: trunk/tools/updatesite/site.xml
===================================================================
--- trunk/tools/updatesite/site.xml 2008-10-18 01:32:00 UTC (rev 3130)
+++ trunk/tools/updatesite/site.xml 2008-10-18 01:47:06 UTC (rev 3131)
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <description url="http://vexi.sourceforge.net/vexidev/updatesite";>
- Vexi Eclipse feature update site
- </description>
- <feature url="features/org.vexi.vexidev_feature_0.2.0.jar"
id="org.vexi.vexidev_feature" version="0.2.0"/>
- <category-def name="Vexidev" label="Vexidev Category"/>
-</site>
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <description url="http://vexi.sourceforge.net/vexidev/updatesite";>
+ Vexi Eclipse feature update site
+ </description>
+ <feature url="features/org.vexi.vexidev_feature_0.3.0.jar"
id="org.vexi.vexidev_feature" version="0.3.0"/>
+ <category-def name="Vexidev" label="Vexidev Category"/>
+</site>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
