aseclipseplugin-cvs — Notificationmalinglist

[ASDT-cvs] org.asdt.logger/src/org/asdt/logger/ui/actions ASLoggerClientSelectionAction.java,1.1,1.2 AddLoggerAction.java,1.3,1.4

[Boris B. <bbe...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/ui/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30160/src/org/asdt/logger/ui/actions

Modified Files:
	ASLoggerClientSelectionAction.java AddLoggerAction.java 
Log Message:
Expend logger functionnalities
- double click > open file
- icons
- ...

Index: ASLoggerClientSelectionAction.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/ui/actions/ASLoggerClientSelectionAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ASLoggerClientSelectionAction.java	13 Jul 2005 22:05:45 -0000	1.1
--- ASLoggerClientSelectionAction.java	7 Sep 2005 17:21:16 -0000	1.2
***************
*** 5,11 ****
  
  import org.asdt.logger.ASLoggerPlugin;
  import org.asdt.logger.internal.ClientLogReceiver;
  import org.eclipse.jface.action.Action;
- import org.eclipse.jface.action.ContributionItem;
  import org.eclipse.jface.action.IMenuCreator;
  import org.eclipse.jface.resource.ImageDescriptor;
--- 5,11 ----
  
  import org.asdt.logger.ASLoggerPlugin;
+ import org.asdt.logger.IASLoggerConstants;
  import org.asdt.logger.internal.ClientLogReceiver;
  import org.eclipse.jface.action.Action;
  import org.eclipse.jface.action.IMenuCreator;
  import org.eclipse.jface.resource.ImageDescriptor;
***************
*** 17,37 ****
  import org.eclipse.swt.widgets.Menu;
  import org.eclipse.swt.widgets.MenuItem;
- import org.eclipse.swt.widgets.ToolBar;
- import org.eclipse.swt.widgets.ToolItem;
- import org.eclipse.ui.console.IConsoleConstants;
- import org.eclipse.ui.internal.console.ConsolePluginImages;
  
  public class ASLoggerClientSelectionAction extends Action 
  {
   
- 	
- 	
- 	
  	public ImageDescriptor getImageDescriptor()
  	{
! 		return ASLoggerPlugin.getImageDescriptor("icons/toc_closed.gif");
  	}
      
-     
      public int getStyle()
  	{
--- 17,29 ----
  import org.eclipse.swt.widgets.Menu;
  import org.eclipse.swt.widgets.MenuItem;
  
  public class ASLoggerClientSelectionAction extends Action 
  {
   
  	public ImageDescriptor getImageDescriptor()
  	{
! 		return ASLoggerPlugin.getImageDescriptor(IASLoggerConstants.IMAGE_ACTION_CLIENT_SELECTION);
  	}
      
      public int getStyle()
  	{
***************
*** 39,48 ****
  	}
  
- 
  	public IMenuCreator getMenuCreator() {
      	
      	IMenuCreator menuCreator = new IMenuCreator() {
  		
! 			private Image runImage = ASLoggerPlugin.getImageDescriptor("icons/debugt_obj.gif").createImage();
      		
      		public Menu getMenu(Menu parent) {
--- 31,39 ----
  	}
  
  	public IMenuCreator getMenuCreator() {
      	
      	IMenuCreator menuCreator = new IMenuCreator() {
  		
! 			private Image runImage = ASLoggerPlugin.getImageDescriptor(IASLoggerConstants.IMAGE_CLIENT_RUN).createImage();
      		
      		public Menu getMenu(Menu parent) {
***************
*** 55,61 ****
  				if (clients != null && !clients.isEmpty() )
  				{
  					for (Iterator iter = clients.iterator(); iter.hasNext();) {
  						ClientLogReceiver logReceiver = (ClientLogReceiver) iter.next();
! 						MenuItem item = new MenuItem(menu,SWT.CHECK);
  						item.setText(logReceiver.getClientName());
  						item.setData(logReceiver);
--- 46,53 ----
  				if (clients != null && !clients.isEmpty() )
  				{
+ 					// List all clients
  					for (Iterator iter = clients.iterator(); iter.hasNext();) {
  						ClientLogReceiver logReceiver = (ClientLogReceiver) iter.next();
! 						MenuItem item = new MenuItem(menu, SWT.CHECK);
  						item.setText(logReceiver.getClientName());
  						item.setData(logReceiver);
***************
*** 65,68 ****
--- 57,61 ----
  							item.setImage(runImage);
  						}
+ 						
  						if (ASLoggerPlugin.getDefault().getLoggerController().getCurrentClientLogReceiver() == logReceiver)
  						{
***************
*** 73,78 ****
  						
  							public void widgetDefaultSelected(SelectionEvent e) {
- 								// TODO Auto-generated method stub
- 						
  							}
  						
--- 66,69 ----
***************
*** 90,102 ****
  				runImage.dispose();
  				runImage = null;
- 		
  			}
  		
  		};
      	return menuCreator;
-     	
      }
!     
!     
  
  }
--- 81,104 ----
  				runImage.dispose();
  				runImage = null;
  			}
  		
  		};
      	return menuCreator;
      }
! 	
!     /* (non-Javadoc)
!      * Method declared on IAction.
!      */
!     public void setEnabled(boolean enabled) {
!     	firePropertyChange(ENABLED, (enabled) ? Boolean.FALSE : Boolean.TRUE, (enabled) ? Boolean.TRUE : Boolean.FALSE);
!     }
  
+     /* (non-Javadoc)
+      * Method declared on IAction.
+      */
+     public boolean isEnabled() {
+ 		Collection clients = ASLoggerPlugin.getDefault().getLoggerController().getClients();
+ 		return (clients != null && !clients.isEmpty());
+     }
+ 	
  }

Index: AddLoggerAction.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/ui/actions/AddLoggerAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AddLoggerAction.java	2 Sep 2005 16:02:32 -0000	1.3
--- AddLoggerAction.java	7 Sep 2005 17:21:16 -0000	1.4
***************
*** 38,42 ****
  			try
  			{
! 				// create the folder
  				IFolder loggerFolder = project.getFolder(IASLoggerConstants.LOGGER_PATH_NAME);
  				if (!loggerFolder.exists())
--- 38,42 ----
  			try
  			{
! 				// Create the folder
  				IFolder loggerFolder = project.getFolder(IASLoggerConstants.LOGGER_PATH_NAME);
  				if (!loggerFolder.exists())

[ASDT-cvs] org.asdt.logger/META-INF MANIFEST.MF,1.7,1.8

[Boris B. <bbe...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.logger/META-INF
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30160/META-INF

Modified Files:
	MANIFEST.MF 
Log Message:
Expend logger functionnalities
- double click > open file
- icons
- ...

Index: MANIFEST.MF
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/META-INF/MANIFEST.MF,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MANIFEST.MF	23 Aug 2005 23:18:13 -0000	1.7
--- MANIFEST.MF	7 Sep 2005 17:21:16 -0000	1.8
***************
*** 2,6 ****
  Bundle-Name: ASDT Logger
  Bundle-SymbolicName: org.asdt.logger; singleton=true
! Bundle-Version: 0.0.8.build3
  Bundle-ClassPath: logger.jar,
   lib/jdom.jar,
--- 2,6 ----
  Bundle-Name: ASDT Logger
  Bundle-SymbolicName: org.asdt.logger; singleton=true
! Bundle-Version: 0.0.8.build4
  Bundle-ClassPath: logger.jar,
   lib/jdom.jar,
***************
*** 13,16 ****
   org.eclipse.ui.console,
   org.eclipse.core.resources,
!  org.asdt.core
  Eclipse-AutoStart: true
--- 13,17 ----
   org.eclipse.ui.console,
   org.eclipse.core.resources,
!  org.asdt.core,
!  org.asdt.editor
  Eclipse-AutoStart: true

[ASDT-cvs] org.asdt.logger/lib/flash_classes Log.as,1.1,1.2

[Boris B. <bbe...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.logger/lib/flash_classes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30160/lib/flash_classes

Modified Files:
	Log.as 
Log Message:
Expend logger functionnalities
- double click > open file
- icons
- ...

Index: Log.as
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/lib/flash_classes/Log.as,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Log.as	19 Jul 2005 19:17:36 -0000	1.1
--- Log.as	7 Sep 2005 17:21:16 -0000	1.2
***************
*** 54,61 ****
  		if (arguments.length == 4)
  		{
! 			arguments.splice(1,0, Log.INFO);
  		}
  		instance = getInstance();
! 		instance.addMessageToBuffer.apply(instance,arguments);		
  	}	
  	/**
--- 54,61 ----
  		if (arguments.length == 4)
  		{
! 			arguments.splice(1, 0, Log.VERBOSE);
  		}
  		instance = getInstance();
! 		instance.addMessageToBuffer.apply(instance, arguments);		
  	}	
  	/**

[ASDT-cvs] org.asdt.logger plugin.xml,1.6,1.7 build.properties,1.5,1.6

[Boris B. <bbe...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.logger
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30160

Modified Files:
	plugin.xml build.properties 
Log Message:
Expend logger functionnalities
- double click > open file
- icons
- ...

Index: build.properties
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/build.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** build.properties	5 Aug 2005 18:38:25 -0000	1.5
--- build.properties	7 Sep 2005 17:21:16 -0000	1.6
***************
*** 7,8 ****
--- 7,18 ----
                 lib/,\
                 plugin.properties
+ src.includes = .classpath,\
+                .project,\
+                META-INF/,\
+                bin/,\
+                icons/,\
+                build.properties,\
+                lib/,\
+                plugin.properties,\
+                plugin.xml,\
+                src/

Index: plugin.xml
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/plugin.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** plugin.xml	4 Aug 2005 16:51:49 -0000	1.6
--- plugin.xml	7 Sep 2005 17:21:16 -0000	1.7
***************
*** 13,17 ****
              category="org.asdt.views"
              class="org.asdt.logger.ui.views.ASLoggerView"
!             icon="icons/logfileviewer.gif"
              id="org.asdt.logger.ui.views.ASLoggerView"
              name="AS Logger">
--- 13,17 ----
              category="org.asdt.views"
              class="org.asdt.logger.ui.views.ASLoggerView"
!             icon="icons/as_logger.gif"
              id="org.asdt.logger.ui.views.ASLoggerView"
              name="AS Logger">

[ASDT-cvs] org.asdt.editor plugin.xml,1.10,1.11

[Boris B. <bbe...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.editor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30003

Modified Files:
	plugin.xml 
Log Message:
Rename Internals to Toplevel ... 


Index: plugin.xml
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.editor/plugin.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** plugin.xml	24 Aug 2005 19:02:09 -0000	1.10
--- plugin.xml	7 Sep 2005 17:20:30 -0000	1.11
***************
*** 4,8 ****
     id="org.asdt.editor"
     name="%Plugin.name"
!    version="0.0.8.build3"
     provider-name="%Plugin.provider"
     class="org.asdt.editor.ASEditorPlugin">
--- 4,8 ----
     id="org.asdt.editor"
     name="%Plugin.name"
!    version="0.0.8.build4"
     provider-name="%Plugin.provider"
     class="org.asdt.editor.ASEditorPlugin">

[ASDT-cvs] org.asdt.editor/src/org/asdt/editor/util ASFileOpener.java,1.1,1.2

[Boris B. <bbe...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30003/src/org/asdt/editor/util

Modified Files:
	ASFileOpener.java 
Log Message:
Rename Internals to Toplevel ... 


Index: ASFileOpener.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/util/ASFileOpener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ASFileOpener.java	8 Jun 2005 16:52:32 -0000	1.1
--- ASFileOpener.java	7 Sep 2005 17:20:31 -0000	1.2
***************
*** 34,37 ****
--- 34,40 ----
  import org.eclipse.core.resources.IFile;
  import org.eclipse.core.resources.IProject;
+ import org.eclipse.jface.text.BadLocationException;
+ import org.eclipse.jface.text.IDocument;
+ import org.eclipse.jface.text.TextSelection;
  import org.eclipse.ui.IEditorInput;
  import org.eclipse.ui.IWorkbenchPage;
***************
*** 70,73 ****
--- 73,106 ----
  
  	/**
+ 	 * open a File in Actionscript Editor and select text
+ 	 * 
+ 	 * @param file 				the file to open
+ 	 * @param line 				line number
+ 	 * @param selectionOffset	selection offset
+ 	 * @param selectionSize		selection size
+ 	 * 
+ 	 * @return the new ActionScript2Editor instance for the file or null
+ 	 */
+ 	public static ActionScript2Editor openASFile(IFile file, int line, int selectionOffset, int selectionLength) {
+ 		
+ 		ActionScript2Editor editor = openASFile(file);
+ 		
+ 		if (editor != null) {
+ 			// Highlight and move cursor
+ 			IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
+ 			try {
+ 				line = line - 1;
+ 				int lineOffset = doc.getLineOffset(line);
+ 				editor.setHighlightRange(lineOffset, 1, true);
+ 				editor.getSelectionProvider().setSelection(new TextSelection(lineOffset + selectionOffset, selectionLength));
+ 			} catch (BadLocationException e) {
+ 				e.printStackTrace();
+ 			}
+ 		}
+ 		
+ 		return editor;
+ 	}
+ 	
+ 	/**
  	 * open a ASAbsractType in Actionscript Editor
  	 * 

[ASDT-cvs] org.asdt.editor/src/org/asdt/editor/ui/preferences EditorColorsPreferencesPage.java,1.3,1.4 EditorPreferencesInitializer.java,1.8,1.9

[Boris B. <bbe...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/ui/preferences
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30003/src/org/asdt/editor/ui/preferences

Modified Files:
	EditorColorsPreferencesPage.java 
	EditorPreferencesInitializer.java 
Log Message:
Rename Internals to Toplevel ... 


Index: EditorPreferencesInitializer.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/ui/preferences/EditorPreferencesInitializer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** EditorPreferencesInitializer.java	2 Sep 2005 15:59:30 -0000	1.8
--- EditorPreferencesInitializer.java	7 Sep 2005 17:20:30 -0000	1.9
***************
*** 62,66 ****
          PreferenceConverter.setDefault(store, IASEditorConstants.TYPE_COLOR, new RGB(0, 0, 160));
          PreferenceConverter.setDefault(store, IASEditorConstants.CONSTANTS_COLOR, new RGB(128, 0, 128));
!         PreferenceConverter.setDefault(store, IASEditorConstants.INTERNALS_COLOR, new RGB(128, 128, 0));
          PreferenceConverter.setDefault(store, IASEditorConstants.DEFAULT_COLOR, new RGB(0, 0, 0));
          
--- 62,66 ----
          PreferenceConverter.setDefault(store, IASEditorConstants.TYPE_COLOR, new RGB(0, 0, 160));
          PreferenceConverter.setDefault(store, IASEditorConstants.CONSTANTS_COLOR, new RGB(128, 0, 128));
!         PreferenceConverter.setDefault(store, IASEditorConstants.TOPLEVEL_COLOR, new RGB(128, 128, 0));
          PreferenceConverter.setDefault(store, IASEditorConstants.DEFAULT_COLOR, new RGB(0, 0, 0));
          
***************
*** 76,80 ****
          store.setDefault(IASEditorConstants.TYPE_STYLE, SWT.BOLD);
          store.setDefault(IASEditorConstants.CONSTANTS_STYLE, SWT.BOLD | SWT.ITALIC);
!         store.setDefault(IASEditorConstants.INTERNALS_STYLE, SWT.BOLD | SWT.ITALIC);
          store.setDefault(IASEditorConstants.DEFAULT_STYLE, SWT.NORMAL);
          
--- 76,80 ----
          store.setDefault(IASEditorConstants.TYPE_STYLE, SWT.BOLD);
          store.setDefault(IASEditorConstants.CONSTANTS_STYLE, SWT.BOLD | SWT.ITALIC);
!         store.setDefault(IASEditorConstants.TOPLEVEL_STYLE, SWT.BOLD | SWT.ITALIC);
          store.setDefault(IASEditorConstants.DEFAULT_STYLE, SWT.NORMAL);
          

Index: EditorColorsPreferencesPage.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/ui/preferences/EditorColorsPreferencesPage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EditorColorsPreferencesPage.java	24 Aug 2005 23:13:22 -0000	1.3
--- EditorColorsPreferencesPage.java	7 Sep 2005 17:20:30 -0000	1.4
***************
*** 230,234 ****
  			{ "Core types"				, IASEditorConstants.CORE_TYPE_COLOR			, IASEditorConstants.CORE_TYPE_STYLE			, IASEditorConstants.ACTIONSCRIPT_CATEGORY }, 
  			{ "Constants"				, IASEditorConstants.CONSTANTS_COLOR			, IASEditorConstants.CONSTANTS_STYLE			, IASEditorConstants.ACTIONSCRIPT_CATEGORY }, 
! 			{ "Internals"				, IASEditorConstants.INTERNALS_COLOR			, IASEditorConstants.INTERNALS_STYLE			, IASEditorConstants.ACTIONSCRIPT_CATEGORY }, 
  			{ "Default color"			, IASEditorConstants.DEFAULT_COLOR				, IASEditorConstants.DEFAULT_STYLE				, IASEditorConstants.ACTIONSCRIPT_CATEGORY }
  	};
--- 230,234 ----
  			{ "Core types"				, IASEditorConstants.CORE_TYPE_COLOR			, IASEditorConstants.CORE_TYPE_STYLE			, IASEditorConstants.ACTIONSCRIPT_CATEGORY }, 
  			{ "Constants"				, IASEditorConstants.CONSTANTS_COLOR			, IASEditorConstants.CONSTANTS_STYLE			, IASEditorConstants.ACTIONSCRIPT_CATEGORY }, 
! 			{ "TopLevel"				, IASEditorConstants.TOPLEVEL_COLOR				, IASEditorConstants.TOPLEVEL_STYLE				, IASEditorConstants.ACTIONSCRIPT_CATEGORY }, 
  			{ "Default color"			, IASEditorConstants.DEFAULT_COLOR				, IASEditorConstants.DEFAULT_STYLE				, IASEditorConstants.ACTIONSCRIPT_CATEGORY }
  	};

[ASDT-cvs] org.asdt.editor/src/org/asdt/editor/internal ASCodeScanner.java,1.4,1.5 ASColorAndStyleConfig.java,1.2,1.3

[Boris B. <bbe...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/internal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30003/src/org/asdt/editor/internal

Modified Files:
	ASCodeScanner.java ASColorAndStyleConfig.java 
Log Message:
Rename Internals to Toplevel ... 


Index: ASCodeScanner.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/internal/ASCodeScanner.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ASCodeScanner.java	2 Sep 2005 15:59:30 -0000	1.4
--- ASCodeScanner.java	7 Sep 2005 17:20:31 -0000	1.5
***************
*** 31,35 ****
  import org.asdt.core.resources.ClasspathManager;
  import org.asdt.core.resources.PackageManager;
! import org.asdt.core.util.ASInternals;
  import org.asdt.core.util.ASKeywords;
  import org.asdt.core.util.ASTypes;
--- 31,35 ----
  import org.asdt.core.resources.ClasspathManager;
  import org.asdt.core.resources.PackageManager;
! import org.asdt.core.util.ASTopLevel;
  import org.asdt.core.util.ASKeywords;
  import org.asdt.core.util.ASTypes;
***************
*** 63,67 ****
  	
  	// internals
! 	private static ASInternals asInternals = ASInternals.getInstance();
  	private static String[] fgInternals = asInternals.getWordList();
  	
--- 63,67 ----
  	
  	// internals
! 	private static ASTopLevel asInternals = ASTopLevel.getInstance();
  	private static String[] fgInternals = asInternals.getWordList();
  	

Index: ASColorAndStyleConfig.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/internal/ASColorAndStyleConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ASColorAndStyleConfig.java	2 Sep 2005 15:59:30 -0000	1.2
--- ASColorAndStyleConfig.java	7 Sep 2005 17:20:31 -0000	1.3
***************
*** 129,137 ****
  	
  	public static RGB getInternalsRgb() {
! 		return PreferenceConverter.getColor(prefStore, IASEditorConstants.INTERNALS_COLOR);
  	}
  	
  	public static int getInternalsStyle() {
! 		return prefStore.getInt(IASEditorConstants.INTERNALS_STYLE);
  	}
  	
--- 129,137 ----
  	
  	public static RGB getInternalsRgb() {
! 		return PreferenceConverter.getColor(prefStore, IASEditorConstants.TOPLEVEL_COLOR);
  	}
  	
  	public static int getInternalsStyle() {
! 		return prefStore.getInt(IASEditorConstants.TOPLEVEL_STYLE);
  	}
  	

[ASDT-cvs] org.asdt.editor/src/org/asdt/editor IASEditorConstants.java,1.9,1.10

[Boris B. <bbe...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30003/src/org/asdt/editor

Modified Files:
	IASEditorConstants.java 
Log Message:
Rename Internals to Toplevel ... 


Index: IASEditorConstants.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/IASEditorConstants.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** IASEditorConstants.java	2 Sep 2005 15:59:30 -0000	1.9
--- IASEditorConstants.java	7 Sep 2005 17:20:30 -0000	1.10
***************
*** 80,84 ****
      public static final String TYPE_COLOR = "typeColor";
      public static final String CONSTANTS_COLOR = "constantsColor";
!     public static final String INTERNALS_COLOR = "internalsColor";
      public static final String DEFAULT_COLOR = "defaultColor";
  
--- 80,84 ----
      public static final String TYPE_COLOR = "typeColor";
      public static final String CONSTANTS_COLOR = "constantsColor";
!     public static final String TOPLEVEL_COLOR = "internalsColor";
      public static final String DEFAULT_COLOR = "defaultColor";
  
***************
*** 96,100 ****
      public static final String TYPE_STYLE = "typeStyle";
      public static final String CONSTANTS_STYLE = "constantsStyle";
!     public static final String INTERNALS_STYLE = "internalsStyle";
      public static final String DEFAULT_STYLE = "defaultStyle";
      
--- 96,100 ----
      public static final String TYPE_STYLE = "typeStyle";
      public static final String CONSTANTS_STYLE = "constantsStyle";
!     public static final String TOPLEVEL_STYLE = "internalsStyle";
      public static final String DEFAULT_STYLE = "defaultStyle";
      

[ASDT-cvs] org.asdt.core/src/org/asdt/core/resources AS2TypeManager.java,1.10,1.11

[Martin S. <mb...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.core/src/org/asdt/core/resources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25179/src/org/asdt/core/resources

Modified Files:
	AS2TypeManager.java 
Log Message:
introduced type caching.
it can be turned off with useCache = false
sorry for updating all lines but cvs trows an error on my other pc

Index: AS2TypeManager.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.core/src/org/asdt/core/resources/AS2TypeManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AS2TypeManager.java	2 Sep 2005 15:59:13 -0000	1.10
--- AS2TypeManager.java	7 Sep 2005 12:26:47 -0000	1.11
***************
*** 1,655 ****
! /**********************************************************
!  * ActionScript2 Editor 
!  * Copyright (C) 2004  Peter Schreiber
!  * 
!  * http://www.asdt.org
!  * http://sourceforge.net/projects/aseclipseplugin/
!  *
!  * This program is free software; 
!  * you can redistribute it and/or modify it under the terms of 
!  * the GNU General Public License as published by the 
[...1282 lines suppressed...]
!       *            parse the class/interface body or not
!       * @return the actionscript class defined by the resource
!       */
!      public ASClass getASTypeForResource(IResource resource, boolean parseBody){
!          // check if resource is a "as" file
!          if (resource.getType() == IResource.FILE){
!              IFile file = (IFile) resource;
!              if (file.getFileExtension().equals("as")){
!                  if(useCache){
!                      return AS2TypeCache.getInstance().getAS2Type(file);
!                  }else{
!                      AS2TypeFactory typeFactory = AS2TypeFactory.getInstance();
!                      return typeFactory.getAS2Type(loadDocumentFile(file), false);
!                  }
!              }
!          }
!          return null;
!      }
!  } 
\ No newline at end of file

[ASDT-cvs] org.asdt.core/src/org/asdt/core/resources AS2TypeCache.java,NONE,1.1

[Martin S. <mb...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.core/src/org/asdt/core/resources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22460/src/org/asdt/core/resources

Added Files:
	AS2TypeCache.java 
Log Message:
commit version

--- NEW FILE: AS2TypeCache.java ---
package org.asdt.core.resources;

import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;

import org.asdt.core.dom.ASClass;
import org.asdt.core.util.ASPartitionScanner;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceChangeEvent;
import org.eclipse.core.resources.IResourceChangeListener;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.IResourceDeltaVisitor;
import org.eclipse.core.resources.IResourceVisitor;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IDocumentPartitioner;
import org.eclipse.jface.text.rules.FastPartitioner;

public class AS2TypeCache {
	private static AS2TypeCache instance;

	public static AS2TypeCache getInstance() {
		if (instance == null) {
			instance = new AS2TypeCache();
		}
		return instance;
	}

	/**
	 * key IContainer classpath
	 * value List with IFile
	 */
	private Map resourceMap;

	/**
	 * key IFile
	 * value ASClass
	 */
	private Map typeMap;

	private AS2TypeCache() {
		typeMap = new HashMap();
		resourceMap = new HashMap();
		IWorkspace workspace = ResourcesPlugin.getWorkspace();
		IResourceChangeListener resourceListener = new IResourceChangeListener() {
			public void resourceChanged(IResourceChangeEvent event) {
				IResourceDelta delta = event.getDelta();
				try {
					delta.accept(new CachedResourceVisitor());
				} catch (CoreException e) {
					e.printStackTrace();
				}
			}
		};
		workspace.addResourceChangeListener(resourceListener,
				IResourceChangeEvent.POST_CHANGE);
	}

	public void addClassPath(IContainer classPathFolder) {
		if (!resourceMap.containsKey(classPathFolder)) {
			final List resourceList = new LinkedList();
			try {
				classPathFolder.accept(new IResourceVisitor() {
					public boolean visit(IResource resource)
							throws CoreException {
						if (resource.getType() == IResource.FILE) {
							IFile file = (IFile) resource;
							if (file.getFileExtension() != null
									&& file.getFileExtension().equals("as")) {
								resourceList.add(file);
								addResourceToTypeMap(file);
							}
						}
						return true;
					}
				});
			} catch (CoreException e) {
				// TODO Auto-generated catch block
				e.printStackTrace();
			}
			resourceMap.put(classPathFolder, resourceList);
		}
	}
	public List getASFileList(IContainer classPath) {
		List returnList = new LinkedList();
		addClassPath(classPath);
		returnList.addAll((List) resourceMap.get(classPath));
		return returnList;
	}
	public List getASFileList(IContainer[] classPathes) {
		List returnList = new ArrayList();
		for (int i = 0; i < classPathes.length; i++) {
			returnList.addAll(getASFileList(classPathes[i]));
		}
		return returnList;
	}
	public IFile[] getASFiles(IContainer classPath) {
		List returnList = getASFileList(classPath);
		return (IFile[]) returnList.toArray(new IFile[returnList.size()]);
	}

	public IFile[] getASFiles(IContainer[] classPathes) {
		List returnList = getASFileList(classPathes);
		return (IFile[]) returnList.toArray(new IFile[returnList.size()]);
	}

	public ASClass getAS2Type(IFile file) {
		if(file!=null&&file.exists()){
			if (!typeMap.containsKey(file)) {
				return addResourceToTypeMap(file);
			} else {
				return (ASClass) typeMap.get(file);
			}
		}
		return null;
	}

	private void addResource(IFile file,IContainer classPath){
		ASClass type = addResourceToTypeMap(file);
		if(type!=null&&classPath!=null){
			addResourceToClassPath(file,classPath);
		}
	}

	private ASClass addResourceToTypeMap(IFile file){
		ASClass type = AS2TypeFactory.getInstance().getAS2Type(
				loadDocumentFile(file));
		if (type != null)
			typeMap.put(file, type);
		return type;
	}
	private void addResourceToClassPath(IFile file,IContainer classPath){
		Object value = resourceMap.get(classPath);
		if(value != null){
			List resourceList = (List) value;
			resourceList.add(file);
		}
	}
	
	public void removeResource(IFile file, IContainer classPath) {
		Object removedValue = typeMap.remove(file);
		if(removedValue!=null){
			Object value = resourceMap.get(classPath);
			if(value != null){
				List resourceList = (List) value;
				resourceList.remove(file);
			}
		}
	}
	private IDocument loadDocumentFile(IFile file) {
		IDocument doc = null;
		try {
			doc = new Document(getText(file));
		} catch (Exception e) {
			e.printStackTrace();
		}
		if (doc != null) {
			IDocumentPartitioner partitioner = new FastPartitioner(
					new ASPartitionScanner(), new String[] {
							ASPartitionScanner.AS_COMMENT,
							ASPartitionScanner.AS_MULTILINE_COMMENT,
							ASPartitionScanner.AS_JAVADOC,
							IDocument.DEFAULT_CONTENT_TYPE });
			partitioner.connect(doc);
			doc.setDocumentPartitioner(partitioner);
		}
		return doc;
	}

	private String getText(IFile file) throws Exception {
		InputStream in = file.getContents(true); // new
		ByteArrayOutputStream out = new ByteArrayOutputStream();
		byte[] buf = new byte[1024];
		int read = in.read(buf);
		while (read > 0) {
			out.write(buf, 0, read);
			read = in.read(buf);
		}
		return out.toString();
	}

	class CachedResourceVisitor implements IResourceDeltaVisitor {
		private IContainer[] classpathes;

		private IContainer foundPath = null;

		public CachedResourceVisitor() {
			Set keySet = AS2TypeCache.this.resourceMap.keySet();
			classpathes = (IContainer[]) 
					keySet.toArray(new IContainer[keySet.size()]);
		}

		public boolean visit(IResourceDelta delta) {
			IResource res = delta.getResource();
			if (res.getType() == IResource.FOLDER) {
				for (int i = 0; i < classpathes.length; i++) {
					if (res.equals(classpathes[i])) {
						foundPath = (IContainer) res;
						break;
					}
				}
			} else if (res.getType() == IResource.FILE) {
				if (res.getFileExtension() != null
						&& res.getFileExtension().equals("as")) {
					switch (delta.getKind()) {
					case IResourceDelta.CHANGED:
						if ((delta.getFlags() & IResourceDelta.CONTENT) == 0){
							break;//if no content changed break and do nothing
						}//else re-add changed resource
					case IResourceDelta.ADDED:
						AS2TypeCache.this.addResource((IFile) res,foundPath);
						break;
					case IResourceDelta.REMOVED:
						AS2TypeCache.this.removeResource((IFile) res,foundPath);
						break;
					}
				}
			}
			return true; // visit the children
		}
	}
}

[ASDT-cvs] org.asdt.logger/src/org/asdt/logger/ui/actions AddLoggerAction.java,1.2,1.3

[Martin W. <mar...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/ui/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15934/src/org/asdt/logger/ui/actions

Modified Files:
	AddLoggerAction.java 
Log Message:
Cleaned up javadoc comments.
Refactor word list classes.
Standardised spelling of 'classpathes' to classpath.
(Finishing from previous commit that stopped due to unknown server message relating to timestamps)

Index: AddLoggerAction.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/ui/actions/AddLoggerAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AddLoggerAction.java	4 Aug 2005 21:29:57 -0000	1.2
--- AddLoggerAction.java	2 Sep 2005 16:02:32 -0000	1.3
***************
*** 45,53 ****
  							null);
  					//	 add to classpath
! 					List classpathes = ClasspathManager.getInstance().getSourceClasspath(project);
! 					if (!classpathes.contains(IASLoggerConstants.LOGGER_PATH_NAME))
  					{
! 						classpathes.add(IASLoggerConstants.LOGGER_PATH_NAME);
! 						ClasspathManager.getInstance().setClassPathesToFile(project, classpathes);
  					}
  					
--- 45,53 ----
  							null);
  					//	 add to classpath
! 					List classpaths = ClasspathManager.getInstance().getSourceClasspath(project);
! 					if (!classpaths.contains(IASLoggerConstants.LOGGER_PATH_NAME))
  					{
! 						classpaths.add(IASLoggerConstants.LOGGER_PATH_NAME);
! 						ClasspathManager.getInstance().setClassPathsToFile(project, classpaths);
  					}
  					

[ASDT-cvs] org.asdt.compiler/src/org/asdt/compiler/ui/properties ASBuilderPropertyPage.java,1.6,1.7

[Martin W. <mar...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.compiler/src/org/asdt/compiler/ui/properties
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15077/src/org/asdt/compiler/ui/properties

Modified Files:
	ASBuilderPropertyPage.java 
Log Message:
Cleaned up javadoc comments.
Refactor word list classes.
Standardised spelling of 'classpathes' to classpath.

Index: ASBuilderPropertyPage.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.compiler/src/org/asdt/compiler/ui/properties/ASBuilderPropertyPage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ASBuilderPropertyPage.java	23 Jun 2005 11:11:25 -0000	1.6
--- ASBuilderPropertyPage.java	2 Sep 2005 16:00:17 -0000	1.7
***************
*** 79,83 ****
  
      /**
!      * @param composite
       */
      private void createSrcPart(Composite parent) {        
--- 79,83 ----
  
      /**
!      * @param parent
       */
      private void createSrcPart(Composite parent) {        

[ASDT-cvs] org.asdt.compiler/src/org/asdt/compiler/internal CompilerUnit.java,1.18,1.19 MarkersManager.java,1.6,1.7 AbstractCompiler.java,1.10,1.11

[Martin W. <mar...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.compiler/src/org/asdt/compiler/internal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15077/src/org/asdt/compiler/internal

Modified Files:
	CompilerUnit.java MarkersManager.java AbstractCompiler.java 
Log Message:
Cleaned up javadoc comments.
Refactor word list classes.
Standardised spelling of 'classpathes' to classpath.

Index: CompilerUnit.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.compiler/src/org/asdt/compiler/internal/CompilerUnit.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** CompilerUnit.java	24 Jun 2005 21:14:10 -0000	1.18
--- CompilerUnit.java	2 Sep 2005 16:00:16 -0000	1.19
***************
*** 104,108 ****
  	 * Run compiler build in async process
  	 *  
! 	 * @param editor
  	 */
      public static void runCompilerBuild(final BuildItem[] buildItems, final IProgressMonitor monitor) {	    
--- 104,109 ----
  	 * Run compiler build in async process
  	 *  
! 	 * @param buildItems Array of items to build
! 	 * @param monitor progress monitor for this build
  	 */
      public static void runCompilerBuild(final BuildItem[] buildItems, final IProgressMonitor monitor) {	    
***************
*** 298,302 ****
  	 * Get compiler instance
  	 * 
! 	 * @return
  	 */
  	private static AbstractCompiler getCompiler() throws NoCompilerException {
--- 299,303 ----
  	 * Get compiler instance
  	 * 
! 	 * @return An instance of a compiler
  	 */
  	private static AbstractCompiler getCompiler() throws NoCompilerException {
***************
*** 315,319 ****
  	 * Return ActionScript compiler console
  	 * 
! 	 * @return
  	 */
  	private static CompilerConsole getCompilerConsole() {
--- 316,320 ----
  	 * Return ActionScript compiler console
  	 * 
! 	 * @return A console to display output from the compiler
  	 */
  	private static CompilerConsole getCompilerConsole() {
***************
*** 360,364 ****
  	 * 
  	 * @param cmdList
! 	 * @return
  	 */
  	private static String convertCommandLineToString(List cmdList) {
--- 361,365 ----
  	 * 
  	 * @param cmdList
! 	 * @return the complete command line
  	 */
  	private static String convertCommandLineToString(List cmdList) {

Index: AbstractCompiler.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.compiler/src/org/asdt/compiler/internal/AbstractCompiler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AbstractCompiler.java	30 Jun 2005 02:33:13 -0000	1.10
--- AbstractCompiler.java	2 Sep 2005 16:00:16 -0000	1.11
***************
*** 55,59 ****
  	 * @param type
  	 * @param project
! 	 * @return
  	 */
      public abstract List getExecutableCommandLine(IProject project, ASClass type, List additionalParameters) throws BadCompilerExePathException, NoClassOrInterfaceException;
--- 55,59 ----
  	 * @param type
  	 * @param project
! 	 * @return List Strings to compose the command line
  	 */
      public abstract List getExecutableCommandLine(IProject project, ASClass type, List additionalParameters) throws BadCompilerExePathException, NoClassOrInterfaceException;
***************
*** 64,68 ****
  	 * @param inputSwf
  	 * @param outputSwf
! 	 * @return
  	 */
      public abstract List getSWFCommandLine(String inputSwf, String outputSwf);
--- 64,68 ----
  	 * @param inputSwf
  	 * @param outputSwf
! 	 * @return List Strings to create a command line for using input and output swfs
  	 */
      public abstract List getSWFCommandLine(String inputSwf, String outputSwf);
***************
*** 80,84 ****
  	 * Return Exe path from preferences
  	 *  
! 	 * @return
  	 * @throws BadCompilerExePathException
  	 */
--- 80,84 ----
  	 * Return Exe path from preferences
  	 *  
! 	 * @return String path to compiler executable
  	 * @throws BadCompilerExePathException
  	 */

Index: MarkersManager.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.compiler/src/org/asdt/compiler/internal/MarkersManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MarkersManager.java	24 Aug 2005 12:47:20 -0000	1.6
--- MarkersManager.java	2 Sep 2005 16:00:16 -0000	1.7
***************
*** 51,55 ****
  	 * Add new marker to markes list
  	 * 
! 	 * @param marker
  	 */
  	public static void createMarker(IResource resource, Map attributes) {
--- 51,56 ----
  	 * Add new marker to markes list
  	 * 
! 	 * @param resource
! 	 * @param attributes
  	 */
  	public static void createMarker(IResource resource, Map attributes) {

[ASDT-cvs] org.asdt.compiler/src/org/asdt/compiler/ui/dialog BuildItemDialog.java,1.3,1.4

[Martin W. <mar...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.compiler/src/org/asdt/compiler/ui/dialog
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15077/src/org/asdt/compiler/ui/dialog

Modified Files:
	BuildItemDialog.java 
Log Message:
Cleaned up javadoc comments.
Refactor word list classes.
Standardised spelling of 'classpathes' to classpath.

Index: BuildItemDialog.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.compiler/src/org/asdt/compiler/ui/dialog/BuildItemDialog.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BuildItemDialog.java	24 Aug 2005 12:47:20 -0000	1.3
--- BuildItemDialog.java	2 Sep 2005 16:00:16 -0000	1.4
***************
*** 143,147 ****
  	/**
  	 * Check fields validity
!      * @return
       */
      private boolean isValid() {
--- 143,147 ----
  	/**
  	 * Check fields validity
!      * @return the validity of the details
       */
      private boolean isValid() {

[ASDT-cvs] org.asdt.compiler/src/org/asdt/compiler/mtasc MTASCCompiler.java,1.16,1.17

[Martin W. <mar...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.compiler/src/org/asdt/compiler/mtasc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15077/src/org/asdt/compiler/mtasc

Modified Files:
	MTASCCompiler.java 
Log Message:
Cleaned up javadoc comments.
Refactor word list classes.
Standardised spelling of 'classpathes' to classpath.

Index: MTASCCompiler.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.compiler/src/org/asdt/compiler/mtasc/MTASCCompiler.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** MTASCCompiler.java	24 Jun 2005 22:40:32 -0000	1.16
--- MTASCCompiler.java	2 Sep 2005 16:00:17 -0000	1.17
***************
*** 68,72 ****
       * @param type
       * @param project
!      * @return
       */
      public List getExecutableCommandLine(IProject project, ASClass type, List additionalParameters) throws BadCompilerExePathException, NoClassOrInterfaceException {
--- 68,72 ----
       * @param type
       * @param project
!      * @return List of strings to compose the command line
       */
      public List getExecutableCommandLine(IProject project, ASClass type, List additionalParameters) throws BadCompilerExePathException, NoClassOrInterfaceException {
***************
*** 111,116 ****
          // Get -cp arguments
          String cps = new String();
!         List pathes = ClasspathManager.getInstance().getProjectAllClasspathes(project);
!         for (Iterator iter = pathes.iterator(); iter.hasNext();) {
              cps += "-cp \"" + iter.next() + "\" ";
          }
--- 111,116 ----
          // Get -cp arguments
          String cps = new String();
!         List paths = ClasspathManager.getInstance().getProjectAllClasspaths(project);
!         for (Iterator iter = paths.iterator(); iter.hasNext();) {
              cps += "-cp \"" + iter.next() + "\" ";
          }
***************
*** 148,152 ****
  	 * @param inputSwf
  	 * @param outputSwf
! 	 * @return
  	 */
      public List getSWFCommandLine(String inputSwf, String outputSwf) {
--- 148,152 ----
  	 * @param inputSwf
  	 * @param outputSwf
! 	 * @return list of strings to compose command line for using input / output swfs 
  	 */
      public List getSWFCommandLine(String inputSwf, String outputSwf) {
***************
*** 313,317 ****
       * Return Exe path from preferences
       *  
!      * @return
       * @throws BadCompilerExePathException
       */
--- 313,317 ----
       * Return Exe path from preferences
       *  
!      * @return the path to the MTASC executable
       * @throws BadCompilerExePathException
       */

[ASDT-cvs] org.asdt.compiler/src/org/asdt/compiler/builder BuildItem.java,1.3,1.4 BuildManager.java,1.3,1.4

[Martin W. <mar...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.compiler/src/org/asdt/compiler/builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15077/src/org/asdt/compiler/builder

Modified Files:
	BuildItem.java BuildManager.java 
Log Message:
Cleaned up javadoc comments.
Refactor word list classes.
Standardised spelling of 'classpathes' to classpath.

Index: BuildManager.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.compiler/src/org/asdt/compiler/builder/BuildManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BuildManager.java	24 Jun 2005 21:14:10 -0000	1.3
--- BuildManager.java	2 Sep 2005 16:00:17 -0000	1.4
***************
*** 64,68 ****
       * Get instance of BuildManager
       *  
!      * @return
       */
      public static BuildManager getInstance() {
--- 64,68 ----
       * Get instance of BuildManager
       *  
!      * @return BuildManager
       */
      public static BuildManager getInstance() {

Index: BuildItem.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.compiler/src/org/asdt/compiler/builder/BuildItem.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BuildItem.java	23 Jun 2005 14:18:23 -0000	1.3
--- BuildItem.java	2 Sep 2005 16:00:17 -0000	1.4
***************
*** 74,83 ****
      /**
       * @return Returns the AS type.
       */
      public ASClass getASType() {
          
          if (asType == null) {
!             List classpathes = ClasspathManager.getInstance().getProjectClasspath(project);
!             asType = AS2TypeManager.getInstance().getDomForFullAbstractTypeName(asClass, project, classpathes);
          }
          
--- 74,87 ----
      /**
       * @return Returns the AS type.
+      * If the type isnt already known then it is retrieved by first
+      * querying the <code>ClasspathManager</code> for a list of classpaths
+      * These are then used with the current type name (asClass) to query the 
+      * <code>AS2TypeManager</code> for this particular type.
       */
      public ASClass getASType() {
          
          if (asType == null) {
!             List classpaths = ClasspathManager.getInstance().getProjectClasspath(project);
!             asType = AS2TypeManager.getInstance().getDomForFullAbstractTypeName(asClass, project, classpaths);
          }
          
***************
*** 86,90 ****
      
      /**
!      * @return Returns the AS type.
       */
      public void setASType(ASClass type) {
--- 90,95 ----
      
      /**
!      * @param type The actionscript type of this build item. 
!      * The actionscript class is generated from the the type name.
       */
      public void setASType(ASClass type) {
***************
*** 117,121 ****
      
      /**
!      * @param swfOutputFile The swfOutputFile to set.
       */
      public void setSwfOutputFile(String swfFile) {
--- 122,126 ----
      
      /**
!      * @param swfFile The swfOutputFile to set.
       */
      public void setSwfOutputFile(String swfFile) {
***************
*** 140,144 ****
      
      /**
!      * @param active The bActive to set.
       */
      public void setActive(boolean active) {
--- 145,149 ----
      
      /**
!      * @param active Boolean flag to set if this item is active.
       */
      public void setActive(boolean active) {
***************
*** 147,151 ****
      
      /**
!      * @return
       */
      public boolean isActive() {
--- 152,156 ----
      
      /**
!      * @return Returns the active status of this item.
       */
      public boolean isActive() {
***************
*** 162,165 ****
--- 167,171 ----
      /**
       * @param additionalCompilerParamters The additionalCompilerParamters to set.
+      * Compiler parameters are provided as a string.
       */
      public void setAdditionalCompilerParamters(String additionalCompilerParamters) {

[ASDT-cvs] org.asdt.launcher/src/org/asdt/launcher/ui AbstractASLaunchConfigurationTab.java,1.1,1.2

[Martin W. <mar...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.launcher/src/org/asdt/launcher/ui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14920/src/org/asdt/launcher/ui

Modified Files:
	AbstractASLaunchConfigurationTab.java 
Log Message:
Cleaned up javadoc comments.
Refactor word list classes.
Standardised spelling of 'classpathes' to classpath.

Index: AbstractASLaunchConfigurationTab.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.launcher/src/org/asdt/launcher/ui/AbstractASLaunchConfigurationTab.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractASLaunchConfigurationTab.java	23 Jun 2005 14:20:42 -0000	1.1
--- AbstractASLaunchConfigurationTab.java	2 Sep 2005 15:59:56 -0000	1.2
***************
*** 57,61 ****
       * @param title
       * @param message
!      * @return
       */
      protected IPath chooseDirectoryLocation(String filterPath, String title, String message) {
--- 57,61 ----
       * @param title
       * @param message
!      * @return selected path
       */
      protected IPath chooseDirectoryLocation(String filterPath, String title, String message) {
***************
*** 99,103 ****
       * @param title
       * @param message
!      * @return
       */
      protected IProject chooseProject(String title, String message) {
--- 99,103 ----
       * @param title
       * @param message
!      * @return selected project
       */
      protected IProject chooseProject(String title, String message) {

[ASDT-cvs] org.asdt.wizards/src/org/asdt/wizards/ui NewASClassWizardPage.java,1.6,1.7 NewASProjectWizard.java,1.4,1.5

[Martin W. <mar...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.wizards/src/org/asdt/wizards/ui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14885/src/org/asdt/wizards/ui

Modified Files:
	NewASClassWizardPage.java NewASProjectWizard.java 
Log Message:
Cleaned up javadoc comments.
Refactor word list classes.
Standardised spelling of 'classpathes' to classpath.

Index: NewASClassWizardPage.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.wizards/src/org/asdt/wizards/ui/NewASClassWizardPage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NewASClassWizardPage.java	20 Jun 2005 20:39:10 -0000	1.6
--- NewASClassWizardPage.java	2 Sep 2005 15:59:48 -0000	1.7
***************
*** 86,90 ****
       * Constructor for SampleNewWizardPage.
       * 
!      * @param pageName
       */
      public NewASClassWizardPage(ISelection selection)
--- 86,90 ----
       * Constructor for SampleNewWizardPage.
       * 
!      * @param selection
       */
      public NewASClassWizardPage(ISelection selection)
***************
*** 293,305 ****
                      container = ((IResource) obj).getParent();
  
!                 List pathes = ClasspathManager.getInstance().getSourceClasspath(container.getProject());
                  
                  // Error in case of no classpath
!                 if (pathes.size() == 0) {
                      bClasspathError = true;
      				return;
                  }
  
!                 for (Iterator iter = pathes.iterator(); iter.hasNext();) {
                      String path = (String) iter.next();
                      if (container.getFullPath().toString().startsWith(container.getProject().getFullPath().toString() + "/" + path)) {
--- 293,305 ----
                      container = ((IResource) obj).getParent();
  
!                 List paths = ClasspathManager.getInstance().getSourceClasspath(container.getProject());
                  
                  // Error in case of no classpath
!                 if (paths.size() == 0) {
                      bClasspathError = true;
      				return;
                  }
  
!                 for (Iterator iter = paths.iterator(); iter.hasNext();) {
                      String path = (String) iter.next();
                      if (container.getFullPath().toString().startsWith(container.getProject().getFullPath().toString() + "/" + path)) {

Index: NewASProjectWizard.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.wizards/src/org/asdt/wizards/ui/NewASProjectWizard.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NewASProjectWizard.java	27 Jun 2005 14:54:40 -0000	1.4
--- NewASProjectWizard.java	2 Sep 2005 15:59:48 -0000	1.5
***************
*** 102,105 ****
--- 102,111 ----
      {
          // return false if the corepath is not set!
+     	/**
+     	 * TODO : can we open up the preferences window here and allow the core
+     	 * classpath to be set without throwing away the dialog?
+     	 * Also can we guess the location of the core path from environment variables
+     	 * and some checks for which OS someone is running.
+     	 */
          if (!checkCorePath()) {
              return false;
***************
*** 116,119 ****
--- 122,132 ----
                      if (newProject.exists()) {
                          try {
+                         	/**
+                         	 * TODO : really need to do something else here
+                         	 * The first 'true' argument causes the project to be
+                         	 * 'aggressively deleted' and seems the be the cause of
+                         	 * a lot of problems with people losing their projects
+                         	 * when trying to set up a new project
+                         	 */
                              newProject.delete(true, true, null);
                          } catch (CoreException e1) {
***************
*** 186,190 ****
  	        
  	        // Add to classpath
! 	        ClasspathManager.getInstance().setClassPathesToFile(project, Arrays.asList(new String[] { srcLocation }));
          }
      }
--- 199,203 ----
  	        
  	        // Add to classpath
! 	        ClasspathManager.getInstance().setClassPathsToFile(project, Arrays.asList(new String[] { srcLocation }));
          }
      }
***************
*** 193,197 ****
       * Add ASNature to project
       * 
!      * @param newProject
       * @throws CoreException
       */
--- 206,211 ----
       * Add ASNature to project
       * 
!      * @param project
!      * @param id
       * @throws CoreException
       */
***************
*** 258,262 ****
              return true;
          }
- 
      }
  }
--- 272,275 ----

[ASDT-cvs] ProjectRelevant/ideas ideas.txt,NONE,1.1

[Martin W. <mar...@us...>]

Update of /cvsroot/aseclipseplugin/ProjectRelevant/ideas
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14871/ideas

Added Files:
	ideas.txt 
Log Message:
Cleaned up javadoc comments.
Refactor word list classes.
Standardised spelling of 'classpathes' to classpath.

--- NEW FILE: ideas.txt ---
1. Documentation Styles

Currently there is rudimentary support for some javadoc tags (via core.util.JavaDocKeywords)
Would it be worthwhile making this a pluggable system to allow higlighting (and maybe completion) 
for other popular documentation generators like NaturalDocs etc.

If so, how would be best to go about it.

[ASDT-cvs] org.asdt.editor/src/org/asdt/editor/template/resolvers ArrayResolver.java,1.1,1.2

[Martin W. <mar...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/template/resolvers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14805/src/org/asdt/editor/template/resolvers

Modified Files:
	ArrayResolver.java 
Log Message:
Cleaned up javadoc comments.
Refactor word list classes.
Standardised spelling of 'classpathes' to classpath.

Index: ArrayResolver.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/template/resolvers/ArrayResolver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ArrayResolver.java	8 Jun 2005 16:52:32 -0000	1.1
--- ArrayResolver.java	2 Sep 2005 15:59:30 -0000	1.2
***************
*** 78,82 ****
  	 * @param offset
  	 * @param type
! 	 * @return
  	 */
  	private String getFieldProposal(int offset, ASClass type) {
--- 78,82 ----
  	 * @param offset
  	 * @param type
! 	 * @return first array field?
  	 */
  	private String getFieldProposal(int offset, ASClass type) {
***************
*** 96,100 ****
  	 * @param offset
  	 * @param type
! 	 * @return
  	 */
  	private String getLocalProposal(int offset, ASClass type) {
--- 96,100 ----
  	 * @param offset
  	 * @param type
! 	 * @return nearest local array
  	 */
  	private String getLocalProposal(int offset, ASClass type) {

[ASDT-cvs] org.asdt.editor/src/org/asdt/editor IASEditorConstants.java,1.8,1.9 ASEditorPlugin.java,1.2,1.3

[Martin W. <mar...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14805/src/org/asdt/editor

Modified Files:
	IASEditorConstants.java ASEditorPlugin.java 
Log Message:
Cleaned up javadoc comments.
Refactor word list classes.
Standardised spelling of 'classpathes' to classpath.

Index: IASEditorConstants.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/IASEditorConstants.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** IASEditorConstants.java	24 Aug 2005 23:13:22 -0000	1.8
--- IASEditorConstants.java	2 Sep 2005 15:59:30 -0000	1.9
***************
*** 69,74 ****
--- 69,78 ----
  	public static final String SINGLE_LINE_COMMENT_COLOR = "singleLineCommentColor";
      public static final String MULTILINE_COMMENT_COLOR = "multilineCommentColor";
+     
      public static final String JAVADOC_COMMENT_COLOR = "javadocCommentColor";
      public static final String JAVADOC_KEYWORD_COLOR = "javadocKeywordColor";
+     public static final String JAVADOC_LINK_COLOR = "javadocLinkColor";
+     public static final String JAVADOC_TAG_COLOR = "javadocTagColor";
+     
      public static final String STRING_COLOR = "stringColor";
      public static final String KEYWORD_COLOR = "keywordColor";
***************
*** 81,86 ****
--- 85,94 ----
      public static final String SINGLE_LINE_COMMENT_STYLE = "singleLineCommentStyle";
      public static final String MULTILINE_COMMENT_STYLE = "multilineCommentStyle";
+     
      public static final String JAVADOC_COMMENT_STYLE = "javadocCommentStyle";
      public static final String JAVADOC_KEYWORD_STYLE = "javadocKeywordStyle";
+     public static final String JAVADOC_LINK_STYLE = "javadocLinkStyle";
+     public static final String JAVADOC_TAG_STYLE = "javadocTagStyle";
+     
      public static final String STRING_STYLE = "stringStyle";
      public static final String KEYWORD_STYLE = "keywordStyle";

Index: ASEditorPlugin.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/ASEditorPlugin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ASEditorPlugin.java	25 Aug 2005 09:59:17 -0000	1.2
--- ASEditorPlugin.java	2 Sep 2005 15:59:30 -0000	1.3
***************
*** 79,83 ****
      /**
       * Return the template store
!      * @return
       */
  	public TemplateStore getTemplateStore() {
--- 79,83 ----
      /**
       * Return the template store
!      * @return the template store
       */
  	public TemplateStore getTemplateStore() {
***************
*** 96,100 ****
  	/**
  	 * Return context type registry
! 	 * @return
  	 */
      public ContextTypeRegistry getContextTypeRegistry() {
--- 96,100 ----
  	/**
  	 * Return context type registry
! 	 * @return context type registry for this plugin
  	 */
      public ContextTypeRegistry getContextTypeRegistry() {

[ASDT-cvs] org.asdt.editor/src/org/asdt/editor/ui/preferences EditorPreferencesInitializer.java,1.7,1.8

[Martin W. <mar...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/ui/preferences
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14805/src/org/asdt/editor/ui/preferences

Modified Files:
	EditorPreferencesInitializer.java 
Log Message:
Cleaned up javadoc comments.
Refactor word list classes.
Standardised spelling of 'classpathes' to classpath.

Index: EditorPreferencesInitializer.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/ui/preferences/EditorPreferencesInitializer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** EditorPreferencesInitializer.java	24 Aug 2005 23:13:22 -0000	1.7
--- EditorPreferencesInitializer.java	2 Sep 2005 15:59:30 -0000	1.8
***************
*** 55,58 ****
--- 55,60 ----
          PreferenceConverter.setDefault(store, IASEditorConstants.JAVADOC_COMMENT_COLOR, new RGB(63, 95, 191));
          PreferenceConverter.setDefault(store, IASEditorConstants.JAVADOC_KEYWORD_COLOR, new RGB(127, 159, 191));
+         PreferenceConverter.setDefault(store, IASEditorConstants.JAVADOC_LINK_COLOR, new RGB(63, 63, 191));
+         PreferenceConverter.setDefault(store, IASEditorConstants.JAVADOC_TAG_COLOR, new RGB(127, 127, 159));
          PreferenceConverter.setDefault(store, IASEditorConstants.STRING_COLOR, new RGB(0, 0, 255));
          PreferenceConverter.setDefault(store, IASEditorConstants.KEYWORD_COLOR, new RGB(128, 0, 128));
***************
*** 62,70 ****
          PreferenceConverter.setDefault(store, IASEditorConstants.INTERNALS_COLOR, new RGB(128, 128, 0));
          PreferenceConverter.setDefault(store, IASEditorConstants.DEFAULT_COLOR, new RGB(0, 0, 0));
! 
          store.setDefault(IASEditorConstants.SINGLE_LINE_COMMENT_STYLE, SWT.NORMAL);
          store.setDefault(IASEditorConstants.MULTILINE_COMMENT_STYLE, SWT.NORMAL);
          store.setDefault(IASEditorConstants.JAVADOC_COMMENT_STYLE, SWT.NORMAL);
          store.setDefault(IASEditorConstants.JAVADOC_KEYWORD_STYLE, SWT.BOLD);
          store.setDefault(IASEditorConstants.STRING_STYLE, SWT.NORMAL);
          store.setDefault(IASEditorConstants.KEYWORD_STYLE, SWT.BOLD);
--- 64,74 ----
          PreferenceConverter.setDefault(store, IASEditorConstants.INTERNALS_COLOR, new RGB(128, 128, 0));
          PreferenceConverter.setDefault(store, IASEditorConstants.DEFAULT_COLOR, new RGB(0, 0, 0));
!         
          store.setDefault(IASEditorConstants.SINGLE_LINE_COMMENT_STYLE, SWT.NORMAL);
          store.setDefault(IASEditorConstants.MULTILINE_COMMENT_STYLE, SWT.NORMAL);
          store.setDefault(IASEditorConstants.JAVADOC_COMMENT_STYLE, SWT.NORMAL);
          store.setDefault(IASEditorConstants.JAVADOC_KEYWORD_STYLE, SWT.BOLD);
+         store.setDefault(IASEditorConstants.JAVADOC_LINK_STYLE, SWT.BOLD);
+         store.setDefault(IASEditorConstants.JAVADOC_TAG_STYLE, SWT.BOLD);
          store.setDefault(IASEditorConstants.STRING_STYLE, SWT.NORMAL);
          store.setDefault(IASEditorConstants.KEYWORD_STYLE, SWT.BOLD);
***************
*** 78,82 ****
          store.setDefault(IASEditorConstants.OUTLINE_UPDATE_DELAY, 500);
          store.setDefault(IASEditorConstants.HIGHLIGHT_MATCHING_BRACE, true);
!         store.setDefault(IASEditorConstants.FORCE_BOM, true);
          store.setDefault(IASEditorConstants.ENABLE_FOLDING, true);
          store.setDefault(IASEditorConstants.INITIAL_FOLD_IMPORTS, true);
--- 82,88 ----
          store.setDefault(IASEditorConstants.OUTLINE_UPDATE_DELAY, 500);
          store.setDefault(IASEditorConstants.HIGHLIGHT_MATCHING_BRACE, true);
!         // I think its best to keep FORCE_BOM off by default until it stops
!         // throwing the 'resource has changed dialog'
!         store.setDefault(IASEditorConstants.FORCE_BOM, false);
          store.setDefault(IASEditorConstants.ENABLE_FOLDING, true);
          store.setDefault(IASEditorConstants.INITIAL_FOLD_IMPORTS, true);

[ASDT-cvs] org.asdt.editor/src/org/asdt/editor/internal ASCompletionProcessor.java,1.3,1.4 JavaDocScanner.java,1.3,1.4 ASCodeScanner.java,1.3,1.4 JavaDocCompletionProcessor.java,1.1,1.2 ASColorAndStyleConfig.java,1.1,1.2

[Martin W. <mar...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/internal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14805/src/org/asdt/editor/internal

Modified Files:
	ASCompletionProcessor.java JavaDocScanner.java 
	ASCodeScanner.java JavaDocCompletionProcessor.java 
	ASColorAndStyleConfig.java 
Log Message:
Cleaned up javadoc comments.
Refactor word list classes.
Standardised spelling of 'classpathes' to classpath.

Index: JavaDocScanner.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/internal/JavaDocScanner.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JavaDocScanner.java	24 Aug 2005 13:38:05 -0000	1.3
--- JavaDocScanner.java	2 Sep 2005 15:59:30 -0000	1.4
***************
*** 85,89 ****
  		// Add word rule for keywords.
  		WordRule wordRule = new WordRule(new JavaDocWordDetector());
! 		String[] fgKeywords = JavaDocKeywords.getInstance().getKeywords();
  		for (int i = 0; i < fgKeywords.length; i++)
  			wordRule.addWord(fgKeywords[i], keyword);
--- 85,89 ----
  		// Add word rule for keywords.
  		WordRule wordRule = new WordRule(new JavaDocWordDetector());
! 		String[] fgKeywords = JavaDocKeywords.getInstance().getWordList();
  		for (int i = 0; i < fgKeywords.length; i++)
  			wordRule.addWord(fgKeywords[i], keyword);

Index: ASColorAndStyleConfig.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/internal/ASColorAndStyleConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ASColorAndStyleConfig.java	24 Aug 2005 13:38:05 -0000	1.1
--- ASColorAndStyleConfig.java	2 Sep 2005 15:59:30 -0000	1.2
***************
*** 64,87 ****
  	
  	public static RGB getJavaDocLinkRgb() {
! 		return new RGB(63, 63, 191);
  	}
  
  	public static int getJavaDocLinkStyle() {
! 		return 1;
  	}
! 	
  	public static RGB getJavaDocTagRgb() {
! 		return new RGB(127, 127, 159);
  	}
  
  	public static int getJavaDocTagStyle() {
! 		return 1;
  	}
  	
! 	public static RGB getKeyworkRgb() {
  		return PreferenceConverter.getColor(prefStore, IASEditorConstants.KEYWORD_COLOR);
  	}
  
! 	public static int getKeyworkStyle() {
  		return prefStore.getInt(IASEditorConstants.KEYWORD_STYLE);
  	}
--- 64,87 ----
  	
  	public static RGB getJavaDocLinkRgb() {
! 		return PreferenceConverter.getColor(prefStore, IASEditorConstants.JAVADOC_LINK_COLOR);
  	}
  
  	public static int getJavaDocLinkStyle() {
! 		return prefStore.getInt(IASEditorConstants.JAVADOC_LINK_STYLE);
  	}
! 
  	public static RGB getJavaDocTagRgb() {
! 		return PreferenceConverter.getColor(prefStore, IASEditorConstants.JAVADOC_TAG_COLOR);
  	}
  
  	public static int getJavaDocTagStyle() {
! 		return prefStore.getInt(IASEditorConstants.JAVADOC_TAG_STYLE);
  	}
  	
! 	public static RGB getKeywordRgb() {
  		return PreferenceConverter.getColor(prefStore, IASEditorConstants.KEYWORD_COLOR);
  	}
  
! 	public static int getKeywordStyle() {
  		return prefStore.getInt(IASEditorConstants.KEYWORD_STYLE);
  	}

Index: ASCodeScanner.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/internal/ASCodeScanner.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ASCodeScanner.java	24 Aug 2005 13:38:05 -0000	1.3
--- ASCodeScanner.java	2 Sep 2005 15:59:30 -0000	1.4
***************
*** 53,61 ****
  	// keyWords
  	private static ASKeywords asKeywords = ASKeywords.getInstance(); 
! 	private static String[] fgKeywords = asKeywords.getKeywords(); 
  	
  	// types
  	private static ASTypes asTypes = ASTypes.getInstance(); 
! 	private static String[] fgTypes = asTypes.getTypes();
  
  	// constants
--- 53,61 ----
  	// keyWords
  	private static ASKeywords asKeywords = ASKeywords.getInstance(); 
! 	private static String[] fgKeywords = asKeywords.getWordList(); 
  	
  	// types
  	private static ASTypes asTypes = ASTypes.getInstance(); 
! 	private static String[] fgTypes = asTypes.getWordList();
  
  	// constants
***************
*** 64,73 ****
  	// internals
  	private static ASInternals asInternals = ASInternals.getInstance();
! 	private static String[] fgInternals = asInternals.getInternals();
  	
  	public ASCodeScanner(ColorManager manager, TextEditor editor) {
  
  	    IToken keyword = new Token(new TextAttribute(manager.getColor(ASColorAndStyleConfig
! 				.getKeyworkRgb()), null, ASColorAndStyleConfig.getKeyworkStyle()));
  	    
  		IToken type = new Token(new TextAttribute(manager.getColor(ASColorAndStyleConfig
--- 64,73 ----
  	// internals
  	private static ASInternals asInternals = ASInternals.getInstance();
! 	private static String[] fgInternals = asInternals.getWordList();
  	
  	public ASCodeScanner(ColorManager manager, TextEditor editor) {
  
  	    IToken keyword = new Token(new TextAttribute(manager.getColor(ASColorAndStyleConfig
! 				.getKeywordRgb()), null, ASColorAndStyleConfig.getKeywordStyle()));
  	    
  		IToken type = new Token(new TextAttribute(manager.getColor(ASColorAndStyleConfig

Index: ASCompletionProcessor.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/internal/ASCompletionProcessor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ASCompletionProcessor.java	24 Aug 2005 18:04:05 -0000	1.3
--- ASCompletionProcessor.java	2 Sep 2005 15:59:30 -0000	1.4
***************
*** 399,404 ****
  	 * @param viewer
  	 * @param offset
! 	 * @param selProspalWords
! 	 * @throws BadLocationException
  	 */
  	private List getKeywordProposals(ITextViewer viewer, int offset, String part)
--- 399,404 ----
  	 * @param viewer
  	 * @param offset
! 	 * @param part The part of the word that has been typed so far
! 	 * @return keywords which match the supplied word part 
  	 */
  	private List getKeywordProposals(ITextViewer viewer, int offset, String part)
***************
*** 406,411 ****
  		List proposals = new ArrayList();
  		ASKeywords asKeywords = ASKeywords.getInstance();
! 		String[] keyword = asKeywords.getKeywords();
! 		for (int x = 0; x < asKeywords.keywordsCount(); x++)
  		{
  			if (keyword[x].startsWith(part) || part.equals(""))
--- 406,411 ----
  		List proposals = new ArrayList();
  		ASKeywords asKeywords = ASKeywords.getInstance();
! 		String[] keyword = asKeywords.getWordList();
! 		for (int x = 0; x < asKeywords.getWordCount(); x++)
  		{
  			if (keyword[x].startsWith(part) || part.equals(""))
***************
*** 433,437 ****
  	 * @param proposals
  	 * @param part
! 	 * @param foundFolders
  	 * @param packageName
  	 */
--- 433,437 ----
  	 * @param proposals
  	 * @param part
! 	 * @param folder
  	 * @param packageName
  	 */
***************
*** 513,517 ****
  	 *            packageName or "" for rootpackage
  	 * @param part
! 	 * @return
  	 */
  	private List getPackageProposals(ITextViewer viewer, int offset, String packageText, String part)
--- 513,517 ----
  	 *            packageName or "" for rootpackage
  	 * @param part
! 	 * @return packages with match the supplied word part
  	 */
  	private List getPackageProposals(ITextViewer viewer, int offset, String packageText, String part)
***************
*** 576,581 ****
  	 * @param part
  	 * @param asClass
! 	 * @return
! 	 * @throws BadLocationException
  	 */
  	private List getTypeProposals(ITextViewer viewer, int offset, String part, ASClass asClass)
--- 576,580 ----
  	 * @param part
  	 * @param asClass
! 	 * @return types which match the supplied part within the given class
  	 */
  	private List getTypeProposals(ITextViewer viewer, int offset, String part, ASClass asClass)
***************
*** 583,588 ****
  		List proposals = new ArrayList();
  		ASTypes asTypes = ASTypes.getInstance();
! 		String[] type = asTypes.getTypes();
! 		for (int x = 0; x < asTypes.typesCount(); x++)
  		{
  			if (type[x].toLowerCase().startsWith(part.toLowerCase()) || part.equals(""))
--- 582,587 ----
  		List proposals = new ArrayList();
  		ASTypes asTypes = ASTypes.getInstance();
! 		String[] type = asTypes.getWordList();
! 		for (int x = 0; x < asTypes.getWordCount(); x++)
  		{
  			if (type[x].toLowerCase().startsWith(part.toLowerCase()) || part.equals(""))
***************
*** 603,607 ****
  	 * @param part
  	 * @param asClass
! 	 * @return
  	 * @throws BadLocationException
  	 */
--- 602,606 ----
  	 * @param part
  	 * @param asClass
! 	 * @return list of imported types
  	 * @throws BadLocationException
  	 */
***************
*** 713,717 ****
  	 * @param asClass
  	 * @param justVisible
! 	 * @return
  	 * @throws BadLocationException
  	 */
--- 712,716 ----
  	 * @param asClass
  	 * @param justVisible
! 	 * @return list of functions which are applicable in this context
  	 * @throws BadLocationException
  	 */
***************
*** 776,781 ****
  	 * @param asClass
  	 * @param justVisible
! 	 * @return
! 	 * @throws BadLocationException
  	 */
  	private List getVariableProposals(ITextViewer viewer, int offset, String part, ASClass asClass,
--- 775,779 ----
  	 * @param asClass
  	 * @param justVisible
! 	 * @return list of variables which are available within this context
  	 */
  	private List getVariableProposals(ITextViewer viewer, int offset, String part, ASClass asClass,
***************
*** 836,841 ****
  	 * @param asClass
  	 * @param justVisible
! 	 * @return
! 	 * @throws BadLocationException
  	 */
  	private List getPropertiesProposals(ITextViewer viewer, int offset, String part, ASClass asClass,
--- 834,838 ----
  	 * @param asClass
  	 * @param justVisible
! 	 * @return list of properties which are available within this context
  	 */
  	private List getPropertiesProposals(ITextViewer viewer, int offset, String part, ASClass asClass,
***************
*** 874,879 ****
  	 * @param asClass
  	 * @param justVisible
! 	 * @return
! 	 * @throws BadLocationException
  	 */
  	private List getLocalVariableProposals(ITextViewer viewer, int offset, String part, ASClass asClass,
--- 871,875 ----
  	 * @param asClass
  	 * @param justVisible
! 	 * @return list of local variables which are available within this context
  	 */
  	private List getLocalVariableProposals(ITextViewer viewer, int offset, String part, ASClass asClass,

Index: JavaDocCompletionProcessor.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/internal/JavaDocCompletionProcessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JavaDocCompletionProcessor.java	8 Jun 2005 16:52:32 -0000	1.1
--- JavaDocCompletionProcessor.java	2 Sep 2005 15:59:30 -0000	1.2
***************
*** 150,155 ****
  		List proposals = new ArrayList();
  		JavaDocKeywords asKeywords = JavaDocKeywords.getInstance();
! 		String[] keyword = asKeywords.getKeywords();
! 		for (int x = 0; x < asKeywords.keywordsCount(); x++) {
  			if ((keyword[x]).startsWith(part) || part.equals("")) {
  				Image img = ASPluginImages.get(IASCoreUIConstants.JAVADOC_ICON);
--- 150,155 ----
  		List proposals = new ArrayList();
  		JavaDocKeywords asKeywords = JavaDocKeywords.getInstance();
! 		String[] keyword = asKeywords.getWordList();
! 		for (int x = 0; x < asKeywords.getWordCount(); x++) {
  			if ((keyword[x]).startsWith(part) || part.equals("")) {
  				Image img = ASPluginImages.get(IASCoreUIConstants.JAVADOC_ICON);

[ASDT-cvs] org.asdt.core/src/org/asdt/core/dom ASParser.java,1.9,1.10 IAS2Element.java,1.3,1.4 IAS2DOMVisitor.java,1.3,1.4

[Martin W. <mar...@us...>]

Update of /cvsroot/aseclipseplugin/org.asdt.core/src/org/asdt/core/dom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14673/src/org/asdt/core/dom

Modified Files:
	ASParser.java IAS2Element.java IAS2DOMVisitor.java 
Log Message:
Cleaned up javadoc comments.
Refactor word list classes.
Standardised spelling of 'classpathes' to classpath.

Index: ASParser.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.core/src/org/asdt/core/dom/ASParser.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ASParser.java	24 Aug 2005 12:47:13 -0000	1.9
--- ASParser.java	2 Sep 2005 15:59:13 -0000	1.10
***************
*** 490,494 ****
       * 
       * @param pos
!      * @return
       */
      private WordRegion getWordAt(int pos)
--- 490,494 ----
       * 
       * @param pos
!      * @return the region that encloses this position
       */
      private WordRegion getWordAt(int pos)

Index: IAS2DOMVisitor.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.core/src/org/asdt/core/dom/IAS2DOMVisitor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IAS2DOMVisitor.java	8 Jun 2005 16:49:48 -0000	1.3
--- IAS2DOMVisitor.java	2 Sep 2005 15:59:13 -0000	1.4
***************
*** 27,30 ****
--- 27,31 ----
  
  /**
+  * Interface to be implemented by classes that will perform DOM traversal.
   * @author Peter Schreiber
   */
***************
*** 32,35 ****
--- 33,39 ----
  {
      
+     /**
+      * @param as2Element	
+      */
      public void visit(IAS2Element as2Element);
      

Index: IAS2Element.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.core/src/org/asdt/core/dom/IAS2Element.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IAS2Element.java	8 Jun 2005 16:49:48 -0000	1.3
--- IAS2Element.java	2 Sep 2005 15:59:13 -0000	1.4
***************
*** 27,30 ****
--- 27,32 ----
  
  /**
+  * Interface to be implemented by elements that can be traversed by a visitor. 
+  * @see <a href="http://en.wikipedia.org/wiki/Visitor_pattern">WikiPedia : Visitor Pattern</a>
   * @author Peter Schreiber
   */
***************
*** 32,38 ****
  {
      /**
!      * acceptMethod for IAS2Visitor
!      * @param as2Visitor
!      * @param getChilds getChilds if avaliable
       */
      public void accept(IAS2DOMVisitor as2Visitor, boolean visitChilds);
--- 34,39 ----
  {
      /**
!      * @param as2Visitor	The IAS2DOMVisitor that is traversing the dom
!      * @param visitChilds 	visit the children of this element if any exist.
       */
      public void accept(IAS2DOMVisitor as2Visitor, boolean visitChilds);