aseclipseplugin-cvs — Notificationmalinglist

[ASDT-cvs] org.asdt.editor/src/org/asdt/editor/internal ASCompletionProcessor.java,1.4,1.5 ASContentOutlineLabelProvider.java,1.1,1.2

[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-serv15098/src/org/asdt/editor/internal

Modified Files:
	ASCompletionProcessor.java ASContentOutlineLabelProvider.java 
Log Message:
Fix null pointer bug in context proposal

Index: ASContentOutlineLabelProvider.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/internal/ASContentOutlineLabelProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ASContentOutlineLabelProvider.java	8 Jun 2005 16:52:32 -0000	1.1
--- ASContentOutlineLabelProvider.java	9 Sep 2005 17:37:06 -0000	1.2
***************
*** 49,59 ****
              IOutlineItem item = (IOutlineItem) element;  
              return item.getOutlineImage();
-          
          }
          return null;
      }
      
-     
-     
      public String getText(Object element)
      {
--- 49,56 ----

Index: ASCompletionProcessor.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.editor/src/org/asdt/editor/internal/ASCompletionProcessor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ASCompletionProcessor.java	2 Sep 2005 15:59:30 -0000	1.4
--- ASCompletionProcessor.java	9 Sep 2005 17:37:06 -0000	1.5
***************
*** 110,170 ****
  			}
  			String part = textScanHelper.getWordAtOffset(viewer.getDocument(), offset, true).getWord();
! 			String stringWordBefore = wordBefore.getWord();
! 			if (wordBefore != null
! 					&& (stringWordBefore.equals(":") || stringWordBefore.equals("new")
! 							|| stringWordBefore.equals("import")
! 							|| stringWordBefore.equals("extends") || stringWordBefore
! 							.equals("implements")))
! 			{
! 				WordRegion fullText = textScanHelper.getWordAtOffset(viewer.getDocument(), offset, true);
! 				if (fullText != null)
! 				{
! 					String textString = fullText.getWord().trim();
! 					int pointPos = textString.lastIndexOf(".");
! 					if (pointPos > -1)
! 					{
! 						// There is a point!
! 						String lastTextpart = textString.substring(pointPos + 1).trim();
! 						String packageText = textString.substring(0, pointPos).trim();
! 						selProspalWords.addAll(getPackageProposals(viewer, offset, packageText, lastTextpart));
! 						
! 						// Add full package support
! 						if (stringWordBefore.equals("import"))
! 							selProspalWords.addAll(getAllClassesAndRootPackagesProposals(textString, offset));
! 					}
! 					else if (stringWordBefore.equals("import"))
! 					{
! 						// there is no point. And we should show imports
! 						if (textString.length() > 0)
! 							// add full package support
! 							selProspalWords.addAll(getAllClassesAndRootPackagesProposals(textString, offset));
! 						else
! 							selProspalWords.addAll(getPackageProposals(viewer, offset, "", textString));
! 					}
! 					else
  					{
! 						if (stringWordBefore.equals("implements"))
  						{
! 							selProspalWords.addAll(getImportedTypeProposals2(viewer, offset, textString, asClass,
! 									false, true));
  						}
! 						else if (stringWordBefore.equals("extends"))
  						{
! 							selProspalWords.addAll(getImportedTypeProposals2(viewer, offset, textString, asClass, true,
! 									false));
  						}
  						else
  						{
! 							// there is no point and no implements and no extends
! 							if (stringWordBefore.equals(":"))
! 								selProspalWords.addAll(getTypeProposals(viewer, offset, textString, asClass));
! 							selProspalWords.addAll(getImportedTypeProposals(viewer, offset, textString, asClass));
! 							selProspalWords.addAll(getPackageProposals(viewer, offset, "", textString));
  						}
  					}
  				}
- 				prospalKeywords = new ICompletionProposal[selProspalWords.size()];
- 				selProspalWords.toArray(prospalKeywords);
- 				return prospalKeywords;
  			}
  			else
--- 110,169 ----
  			}
  			String part = textScanHelper.getWordAtOffset(viewer.getDocument(), offset, true).getWord();
! 			if (wordBefore != null) {
! 				String stringWordBefore = wordBefore.getWord();
! 				if ((stringWordBefore.equals(":") || stringWordBefore.equals("new")
! 						|| stringWordBefore.equals("import") || stringWordBefore.equals("extends") || stringWordBefore
! 						.equals("implements"))) {
! 					WordRegion fullText = textScanHelper.getWordAtOffset(viewer.getDocument(), offset, true);
! 					if (fullText != null)
  					{
! 						String textString = fullText.getWord().trim();
! 						int pointPos = textString.lastIndexOf(".");
! 						if (pointPos > -1)
  						{
! 							// There is a point!
! 							String lastTextpart = textString.substring(pointPos + 1).trim();
! 							String packageText = textString.substring(0, pointPos).trim();
! 							selProspalWords.addAll(getPackageProposals(viewer, offset, packageText, lastTextpart));
! 							
! 							// Add full package support
! 							if (stringWordBefore.equals("import"))
! 								selProspalWords.addAll(getAllClassesAndRootPackagesProposals(textString, offset));
  						}
! 						else if (stringWordBefore.equals("import"))
  						{
! 							// there is no point. And we should show imports
! 							if (textString.length() > 0)
! 								// add full package support
! 								selProspalWords.addAll(getAllClassesAndRootPackagesProposals(textString, offset));
! 							else
! 								selProspalWords.addAll(getPackageProposals(viewer, offset, "", textString));
  						}
  						else
  						{
! 							if (stringWordBefore.equals("implements"))
! 							{
! 								selProspalWords.addAll(getImportedTypeProposals2(viewer, offset, textString, asClass,
! 										false, true));
! 							}
! 							else if (stringWordBefore.equals("extends"))
! 							{
! 								selProspalWords.addAll(getImportedTypeProposals2(viewer, offset, textString, asClass, true,
! 										false));
! 							}
! 							else
! 							{
! 								// there is no point and no implements and no extends
! 								if (stringWordBefore.equals(":"))
! 									selProspalWords.addAll(getTypeProposals(viewer, offset, textString, asClass));
! 								selProspalWords.addAll(getImportedTypeProposals(viewer, offset, textString, asClass));
! 								selProspalWords.addAll(getPackageProposals(viewer, offset, "", textString));
! 							}
  						}
  					}
+ 					prospalKeywords = new ICompletionProposal[selProspalWords.size()];
+ 					selProspalWords.toArray(prospalKeywords);
+ 					return prospalKeywords;
  				}
  			}
  			else

[ASDT-cvs] org.asdt.logger/src/org/asdt/logger/ui/views ASLoggerView.java,1.9,1.10

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

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

Modified Files:
	ASLoggerView.java 
Log Message:
Fix null pointer bug in context proposal

Index: ASLoggerView.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/ui/views/ASLoggerView.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ASLoggerView.java	8 Sep 2005 08:56:42 -0000	1.9
--- ASLoggerView.java	9 Sep 2005 17:37:01 -0000	1.10
***************
*** 435,448 ****
  					IWorkspace w = ResourcesPlugin.getWorkspace();
  					IFile file = w.getRoot().getFileForLocation(path);
! 					if (file == null) {
  						// Display error message
! 						MessageDialog.openError(viewer.getControl().getShell(), ASLoggerMessages
! 								.getString("error.title"), MessageFormat.format(ASLoggerMessages
! 								.getString("error.cantLoadFile"), new String[] { logginElement
! 								.getFilename() }));
! 					} else {
  						// Open the file in editor and place cursor on logginElement line
  						ASFileOpener.openASFile(file, logginElement.getLine(), 0, 0);
! 					}
  				}
  			}
--- 435,447 ----
  					IWorkspace w = ResourcesPlugin.getWorkspace();
  					IFile file = w.getRoot().getFileForLocation(path);
! 					//if (file == null) {
! 						String message = MessageFormat.format(ASLoggerMessages.getString("error.cantLoadFile"), new String[] { logginElement.getFilename() });
! 						
  						// Display error message
! 						MessageDialog.openError(viewer.getControl().getShell(), ASLoggerMessages.getString("error.title"), message);
! 					/*} else {
  						// Open the file in editor and place cursor on logginElement line
  						ASFileOpener.openASFile(file, logginElement.getLine(), 0, 0);
! 					}*/
  				}
  			}

[ASDT-cvs] org.asdt.logger/src/org/asdt/logger ASLoggerMessages.properties,1.4,1.5

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

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

Modified Files:
	ASLoggerMessages.properties 
Log Message:
Fix null pointer bug in context proposal

Index: ASLoggerMessages.properties
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/ASLoggerMessages.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ASLoggerMessages.properties	7 Sep 2005 17:21:16 -0000	1.4
--- ASLoggerMessages.properties	9 Sep 2005 17:37:01 -0000	1.5
***************
*** 13,17 ****
  RemoveUnusedButton.text=Remove Unused Clients
  RemoveUnusedButton.tooltip=Remove unused clients from list
! StatusLabel.text=Logs captured :  {0} 
  clientSelection.tooltip=Select client 
  
--- 13,17 ----
  RemoveUnusedButton.text=Remove Unused Clients
  RemoveUnusedButton.tooltip=Remove unused clients from list
! StatusLabel.text=Logs captured : {0} 
  clientSelection.tooltip=Select client 
  
***************
*** 19,21 ****
  
  error.title=AS Logger
! error.cantLoadFile=Can't load file : {0}
\ No newline at end of file
--- 19,21 ----
  
  error.title=AS Logger
! error.cantLoadFile=Can't load file {0}
\ No newline at end of file

[ASDT-cvs] org.asdt.core/src/org/asdt/core/util TextScanHelper.java,1.8,1.9

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

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

Modified Files:
	TextScanHelper.java 
Log Message:
Fix null pointer bug in context proposal

Index: TextScanHelper.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.core/src/org/asdt/core/util/TextScanHelper.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TextScanHelper.java	2 Sep 2005 15:59:13 -0000	1.8
--- TextScanHelper.java	9 Sep 2005 17:36:55 -0000	1.9
***************
*** 172,300 ****
      }
      
!     public String getPart(int offset, IDocument document) throws BadLocationException
!     {
  
!         // we want the part before offset
!         int newOffset = offset-1;
!         while (Character.isLetterOrDigit(document.getChar(newOffset)) || document.getChar(newOffset) == '_')
!         {
!             newOffset--;
!         }
!         return document.get(newOffset+1, offset - (newOffset+1));
!     }
  
      /**
!      * finds the beginning offset of the word at given offset
!      * @param offset
!      * @param document
!      * @return position of the start of the word
!      */
!     public int getWordStart(int offset, IDocument document)
!     {
!         try
!         {
!             if (document.getChar(offset) == ':')
!             {
!                 return offset;
!             }
!         } catch (BadLocationException e)
!         {
!         	//i removed this return, becorse document.getChar(offset) WILL corse an
!         	//exception if the cursor stands on the end of the document
!         	//this will be the case when u start typing classes. hope i am right;)
!         	//Nico
!            //return offset;
!         }
! //      get the start before offset
!         int newOffset = offset - 1;
!         try
!         {
!             
!             while (Character.isLetterOrDigit(document.getChar(newOffset))|| document.getChar(newOffset) == '.'|| document.getChar(newOffset) == '_')
!             {
!                 newOffset--;
!                 
!             }
!             return newOffset + 1;
!         } catch (BadLocationException e1)
!         {
!             return newOffset + 1;
!         }
!     }
  
  /*
!     public char getCharBeforeWord(int offset, IDocument document) throws BadLocationException
!     {
!         int newOffset = getWordStart(offset, document);
!         return document.getChar(newOffset - 1);
!     }
   */
      
!     public WordRegion getWordBefore (IDocument document, int offset)
!     {
!         int newOffset = offset - 1;
!         if (newOffset < 0)
!         {
!             return null;
!         }
!         try
!         {
!             if (document.getChar(newOffset) == ':')
!             {
!                 return new WordRegion(newOffset,1,document.get(newOffset,1));
!             }
!             // get this word
!             int wordStart = getWordStart(offset,document);
!             int endNextWord = wordStart - 1 ;
!             while (newOffset >= 0 && Character.isWhitespace(document.getChar(endNextWord)))
!             {
!                 endNextWord--;
!             }       
!             return getWordAtOffset (document,endNextWord,false);
!         } catch (BadLocationException e)
!         {
!             return null;
!         }
!     }
      
      /**
!      * returns the whole word at the given position
!      * @param document
!      * @param offset
!      * @param untilOffset cuts the word at given offset
!      * @return word region at the document offset
!      * @throws BadLocationException
!      */
!     public WordRegion getWordAtOffset (IDocument document, int offset, boolean untilOffset) throws BadLocationException
!     {
!         int startOffset = getWordStart(offset, document);
!         
!         if (untilOffset)
!         {
!             return new WordRegion(startOffset, offset - startOffset,document.get(startOffset , offset - startOffset));
!         }
!         
!         int endOffset = startOffset;
!         if (document.getChar(endOffset) == ':' )
!         {
!             endOffset++;
!             return new WordRegion(startOffset, endOffset - startOffset,document.get(startOffset , endOffset - startOffset));
!         }
!         
!         
!         while (endOffset < document.getLength() && (Character.isLetterOrDigit(document.getChar(endOffset)) || document.getChar(endOffset) == '.' || document.getChar(endOffset) == '_'))
!         {
!             endOffset++;
!         }       
!         return new WordRegion(startOffset, endOffset - startOffset,document.get(startOffset , endOffset - startOffset));
!     }
      
      /**
!      * Finds the full expression at the given offset
!      * @param document
!      * @param offset
!      * @return word region containing the full expression at the offset
!      * @throws BadLocationException
!      */
      public WordRegion findFullExpression (IDocument document, int offset) throws BadLocationException
      {
--- 172,292 ----
      }
      
!     public String getPart(int offset, IDocument document) throws BadLocationException {
  
! 		// we want the part before offset
! 		int newOffset = offset - 1;
! 		while (Character.isLetterOrDigit(document.getChar(newOffset))
! 				|| document.getChar(newOffset) == '_') {
! 			newOffset--;
! 		}
! 		return document.get(newOffset + 1, offset - (newOffset + 1));
! 	}
  
      /**
! 	 * finds the beginning offset of the word at given offset
! 	 * 
! 	 * @param offset
! 	 * @param document
! 	 * @return position of the start of the word
! 	 */
!     public int getWordStart(int offset, IDocument document) {
! 		try {
! 			if (document.getChar(offset) == ':') {
! 				return offset;
! 			}
! 		} catch (BadLocationException e) {
! 			// i removed this return, becorse document.getChar(offset) WILL
! 			// corse an
! 			// exception if the cursor stands on the end of the document
! 			// this will be the case when u start typing classes. hope i am
! 			// right;)
! 			// Nico
! 			// return offset;
! 		}
! 		// get the start before offset
! 		int newOffset = offset - 1;
! 		try {
! 
! 			while (Character.isLetterOrDigit(document.getChar(newOffset))
! 					|| document.getChar(newOffset) == '.' || document.getChar(newOffset) == '_') {
! 				newOffset--;
! 
! 			}
! 			return newOffset + 1;
! 		} catch (BadLocationException e1) {
! 			return newOffset + 1;
! 		}
! 	}
  
  /*
!  * public char getCharBeforeWord(int offset, IDocument document) throws
!  * BadLocationException { int newOffset = getWordStart(offset, document); return
!  * document.getChar(newOffset - 1); }
   */
      
!     public WordRegion getWordBefore(IDocument document, int offset) {
! 		int newOffset = offset - 1;
! 		if (newOffset < 0) {
! 			return null;
! 		}
! 		try {
! 			if (document.getChar(newOffset) == ':') {
! 				return new WordRegion(newOffset, 1, document.get(newOffset, 1));
! 			}
! 			// get this word
! 			int wordStart = getWordStart(offset, document);
! 			int endNextWord = wordStart - 1;
! 			while (newOffset >= 0 && Character.isWhitespace(document.getChar(endNextWord))) {
! 				endNextWord--;
! 			}
! 			return getWordAtOffset(document, endNextWord, false);
! 		} catch (BadLocationException e) {
! 			return null;
! 		}
! 	}
      
      /**
! 	 * returns the whole word at the given position
! 	 * 
! 	 * @param document
! 	 * @param offset
! 	 * @param untilOffset
! 	 *            cuts the word at given offset
! 	 * @return word region at the document offset
! 	 * @throws BadLocationException
! 	 */
!     public WordRegion getWordAtOffset(IDocument document, int offset, boolean untilOffset)
! 			throws BadLocationException {
! 		int startOffset = getWordStart(offset, document);
! 
! 		if (untilOffset) {
! 			return new WordRegion(startOffset, offset - startOffset, document.get(startOffset,
! 					offset - startOffset));
! 		}
! 
! 		int endOffset = startOffset;
! 		if (document.getChar(endOffset) == ':') {
! 			endOffset++;
! 			return new WordRegion(startOffset, endOffset - startOffset, document.get(startOffset,
! 					endOffset - startOffset));
! 		}
! 
! 		while (endOffset < document.getLength()
! 				&& (Character.isLetterOrDigit(document.getChar(endOffset))
! 						|| document.getChar(endOffset) == '.' || document.getChar(endOffset) == '_')) {
! 			endOffset++;
! 		}
! 		return new WordRegion(startOffset, endOffset - startOffset, document.get(startOffset,
! 				endOffset - startOffset));
! 	}
      
      /**
! 	 * Finds the full expression at the given offset
! 	 * 
! 	 * @param document
! 	 * @param offset
! 	 * @return word region containing the full expression at the offset
! 	 * @throws BadLocationException
! 	 */
      public WordRegion findFullExpression (IDocument document, int offset) throws BadLocationException
      {

[ASDT-cvs] org.asdt.core/icons info.gif,NONE,1.1 blank.gif,NONE,1.1

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

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

Added Files:
	info.gif blank.gif 
Log Message:
Fix Out of Memory exception caused by images in logger

--- NEW FILE: info.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: blank.gif ---
(This appears to be a binary file; contents omitted.)

[ASDT-cvs] org.asdt.core/src/org/asdt/core/ui ASPluginImages.java,1.1,1.2 IASCoreUIConstants.java,1.1,1.2

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

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

Modified Files:
	ASPluginImages.java IASCoreUIConstants.java 
Log Message:
Fix Out of Memory exception caused by images in logger

Index: ASPluginImages.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.core/src/org/asdt/core/ui/ASPluginImages.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ASPluginImages.java	8 Jun 2005 16:49:49 -0000	1.1
--- ASPluginImages.java	8 Sep 2005 08:56:46 -0000	1.2
***************
*** 94,97 ****
--- 94,101 ----
  	public static final ImageDescriptor WARNING_ICON = createManaged(IASCoreUIConstants.WARNING_ICON);		
  	
+ 	public static final ImageDescriptor INFO_ICON = createManaged(IASCoreUIConstants.INFO_ICON);	
+ 	
+ 	public static final ImageDescriptor BLANK_ICON = createManaged(IASCoreUIConstants.BLANK_ICON);		
+ 	
  	/**
  	 * Returns the image managed under the given key in this registry.

Index: IASCoreUIConstants.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.core/src/org/asdt/core/ui/IASCoreUIConstants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IASCoreUIConstants.java	8 Jun 2005 16:49:49 -0000	1.1
--- IASCoreUIConstants.java	8 Sep 2005 08:56:46 -0000	1.2
***************
*** 30,81 ****
  public interface IASCoreUIConstants {
  
! 	//icons
  	public static final String CLASS_ICON = "icons/ClassIcon.gif";
- 
  	public static final String INTERFACE_ICON = "icons/InterfaceIcon.gif";
- 
  	public static final String PACKAGE_ICON = "icons/PackageIcon.gif";
- 
  	public static final String PARAMETER_ICON = "icons/ParameterIcon.gif";
- 
  	public static final String PRIVATE_VARIABLE_ICON = "icons/PrivateVariableIcon.gif";
- 
  	public static final String PUBLIC_VARIABLE_ICON = "icons/PublicVariableIcon.gif";
- 
  	public static final String PRIVATE_FUNCTION_ICON = "icons/PrivateFunctionIcon.gif";
- 
  	public static final String PUBLIC_FUNCTION_ICON = "icons/PublicFunctionIcon.gif";
- 
  	public static final String PRIVATE_STATIC_VARIABLE_ICON = "icons/PrivateStaticVariableIcon.gif";
- 
  	public static final String PUBLIC_STATIC_VARIABLE_ICON = "icons/PublicStaticVariableIcon.gif";
- 
  	public static final String PRIVATE_STATIC_FUNCTION_ICON = "icons/PrivateStaticFunctionIcon.gif";
- 
  	public static final String PUBLIC_STATIC_FUNCTION_ICON = "icons/PublicStaticFunctionIcon.gif";
- 	
  	public static final String TEMPLATE_ICON = "icons/template.gif";
- 	
  	public static final String JAVADOC_ICON = "icons/jdoc_tag_obj.gif";
- 	
  	public static final String HTML_ICON = "icons/html_tag_obj.gif";
! 	
! 	//special outline icons
  	public static final String PACKAGE_OUTLINE_ICON = "icons/packd_obj.gif";
- 	
  	public static final String IMPORT_OUTLINE_ICON = "icons/imp_obj.gif";
- 	
  	public static final String IMPORT_ALL_OUTLINE_ICON = "icons/impc_obj.gif";
! 	
! 	//toolbar icons
  	public static final String ALPHABET_SORT_ICON = "icons/alphab_sort_co.gif";
- 	
  	public static final String HIDE_FIELDS_ICON = "icons/fields_co.gif";
- 	
  	public static final String HIDE_STATIC_ICON = "icons/static_co.gif";
! 	
! 	//problem icons
  	public static final String ERROR_ICON = "icons/error.gif";
- 	
  	public static final String WARNING_ICON = "icons/warning.gif";
  }
\ No newline at end of file
--- 30,64 ----
  public interface IASCoreUIConstants {
  
! 	// Icons
  	public static final String CLASS_ICON = "icons/ClassIcon.gif";
  	public static final String INTERFACE_ICON = "icons/InterfaceIcon.gif";
  	public static final String PACKAGE_ICON = "icons/PackageIcon.gif";
  	public static final String PARAMETER_ICON = "icons/ParameterIcon.gif";
  	public static final String PRIVATE_VARIABLE_ICON = "icons/PrivateVariableIcon.gif";
  	public static final String PUBLIC_VARIABLE_ICON = "icons/PublicVariableIcon.gif";
  	public static final String PRIVATE_FUNCTION_ICON = "icons/PrivateFunctionIcon.gif";
  	public static final String PUBLIC_FUNCTION_ICON = "icons/PublicFunctionIcon.gif";
  	public static final String PRIVATE_STATIC_VARIABLE_ICON = "icons/PrivateStaticVariableIcon.gif";
  	public static final String PUBLIC_STATIC_VARIABLE_ICON = "icons/PublicStaticVariableIcon.gif";
  	public static final String PRIVATE_STATIC_FUNCTION_ICON = "icons/PrivateStaticFunctionIcon.gif";
  	public static final String PUBLIC_STATIC_FUNCTION_ICON = "icons/PublicStaticFunctionIcon.gif";
  	public static final String TEMPLATE_ICON = "icons/template.gif";
  	public static final String JAVADOC_ICON = "icons/jdoc_tag_obj.gif";
  	public static final String HTML_ICON = "icons/html_tag_obj.gif";
! 
! 	// Special outline icons
  	public static final String PACKAGE_OUTLINE_ICON = "icons/packd_obj.gif";
  	public static final String IMPORT_OUTLINE_ICON = "icons/imp_obj.gif";
  	public static final String IMPORT_ALL_OUTLINE_ICON = "icons/impc_obj.gif";
! 
! 	// Toolbar icons
  	public static final String ALPHABET_SORT_ICON = "icons/alphab_sort_co.gif";
  	public static final String HIDE_FIELDS_ICON = "icons/fields_co.gif";
  	public static final String HIDE_STATIC_ICON = "icons/static_co.gif";
! 
! 	// Problem icons
  	public static final String ERROR_ICON = "icons/error.gif";
  	public static final String WARNING_ICON = "icons/warning.gif";
+ 	public static final String INFO_ICON = "icons/info.gif";
+ 	public static final String BLANK_ICON = "icons/blank.gif";
  }
\ No newline at end of file

[ASDT-cvs] org.asdt.logger/src/org/asdt/logger/ui/views ASLoggerView.java,1.8,1.9

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

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

Modified Files:
	ASLoggerView.java 
Log Message:
Fix Out of Memory exception caused by images in logger

Index: ASLoggerView.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/ui/views/ASLoggerView.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ASLoggerView.java	7 Sep 2005 21:11:53 -0000	1.8
--- ASLoggerView.java	8 Sep 2005 08:56:42 -0000	1.9
***************
*** 23,26 ****
--- 23,27 ----
   * 
   **********************************************************/
+ 
  package org.asdt.logger.ui.views;
  
***************
*** 28,31 ****
--- 29,33 ----
  import java.text.MessageFormat;
  import java.util.ArrayList;
+ import java.util.List;
  
  import org.asdt.editor.util.ASFileOpener;
***************
*** 109,112 ****
--- 111,119 ----
  		ASLoggerPlugin.getDefault().getLoggerController().addLoggerChangedListener(new ILoggerChangedListener()
  		{
+ 			public void clientLoggerCountChanged()
+ 			{
+ 				clientSelectionItem.setEnabled(clientSelectionItem.isEnabled());
+ 			}
+ 			
  			public void loggerChanged()
  			{
***************
*** 474,489 ****
  			{
  				try {
! 					ArrayList loggedElements = new ArrayList();
  					if (cll != null)
  					{
  						loggedElements = cll.getLoggedElements();
  						viewer.setInput(loggedElements);
- 						lblStatusText.setText(MessageFormat.format(ASLoggerMessages
- 								.getString("StatusLabel.text"), new String[] { Integer
- 								.toString(loggedElements.size()) }));
- 					} else {
- 						viewer.setInput(new ArrayList());
  					}
- 					clientSelectionItem.setEnabled(clientSelectionItem.isEnabled());
  				} catch (Exception e) {
  					e.printStackTrace();
--- 481,501 ----
  			{
  				try {
! 					List loggedElements = new ArrayList();
  					if (cll != null)
  					{
  						loggedElements = cll.getLoggedElements();
+ 						if (loggedElements != null) {
+ 							if (viewer != null) {
+ 								viewer.setInput(loggedElements);
+ 							}
+ 							if (lblStatusText != null) {
+ 								lblStatusText.setText(MessageFormat.format(ASLoggerMessages
+ 										.getString("StatusLabel.text"), new String[] { Integer
+ 										.toString(loggedElements.size()) }));
+ 							}
+ 						}
+ 					} else if (viewer != null) {
  						viewer.setInput(loggedElements);
  					}
  				} catch (Exception e) {
  					e.printStackTrace();

[ASDT-cvs] org.asdt.logger/src/org/asdt/logger/internal ClientLogReceiver.java,1.4,1.5 LoggingElement.java,1.6,1.7 ILoggerChangedListener.java,1.1,1.2 ASLoggerContentProvider.java,1.1,1.2 ASLogger.java,1.6,1.7

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

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

Modified Files:
	ClientLogReceiver.java LoggingElement.java 
	ILoggerChangedListener.java ASLoggerContentProvider.java 
	ASLogger.java 
Log Message:
Fix Out of Memory exception caused by images in logger

Index: ILoggerChangedListener.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/internal/ILoggerChangedListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ILoggerChangedListener.java	8 Jul 2005 21:04:12 -0000	1.1
--- ILoggerChangedListener.java	8 Sep 2005 08:56:41 -0000	1.2
***************
*** 1,6 ****
--- 1,32 ----
+ /**********************************************************
+  * ActionScript2 Editor 
+  * Copyright (C) 2005  asdt.org
+  * 
+  * 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 
+  * Free Software Foundation; either version 2 of the License, 
+  * or (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+  * See the GNU General Public License for more details.
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program; if not, write to the 
+  * Free Software Foundation, Inc., 
+  * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. 
+  * 
+  **********************************************************/
+ 
  package org.asdt.logger.internal;
  
  public interface ILoggerChangedListener
  {
+ 	public void clientLoggerCountChanged();
  	public void loggerChanged();
  }

Index: LoggingElement.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/internal/LoggingElement.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LoggingElement.java	7 Sep 2005 17:21:16 -0000	1.6
--- LoggingElement.java	8 Sep 2005 08:56:41 -0000	1.7
***************
*** 31,34 ****
--- 31,36 ----
  import java.util.List;
  
+ import org.asdt.core.ui.ASPluginImages;
+ import org.asdt.core.ui.IASCoreUIConstants;
  import org.asdt.logger.ASLoggerPlugin;
  import org.asdt.logger.IASLoggerConstants;
***************
*** 135,149 ****
  		switch (getLevel()) {
  			case ERROR:
! 				return ASLoggerPlugin.getImageDescriptor(IASLoggerConstants.IMAGE_LEVEL_ERROR)
! 						.createImage();
  			case WARNING:
! 				return ASLoggerPlugin.getImageDescriptor(IASLoggerConstants.IMAGE_LEVEL_WARNING)
! 						.createImage();
  			case INFO:
! 				return ASLoggerPlugin.getImageDescriptor(IASLoggerConstants.IMAGE_LEVEL_INFO)
! 						.createImage();
  			default:
! 				return ASLoggerPlugin.getImageDescriptor(IASLoggerConstants.IMAGE_BLANK)
! 				.createImage();
  		}
  	}
--- 137,150 ----
  		switch (getLevel()) {
  			case ERROR:
! 				return ASPluginImages.get(IASCoreUIConstants.ERROR_ICON);
! 				
  			case WARNING:
! 				return ASPluginImages.get(IASCoreUIConstants.WARNING_ICON);
! 				
  			case INFO:
! 				return ASPluginImages.get(IASCoreUIConstants.INFO_ICON);
! 				
  			default:
! 				return ASPluginImages.get(IASCoreUIConstants.BLANK_ICON);
  		}
  	}

Index: ASLoggerContentProvider.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/internal/ASLoggerContentProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ASLoggerContentProvider.java	13 Jul 2005 22:05:46 -0000	1.1
--- ASLoggerContentProvider.java	8 Sep 2005 08:56:41 -0000	1.2
***************
*** 23,29 ****
   * 
   **********************************************************/
  package org.asdt.logger.internal;
  
! import java.util.ArrayList;
  import org.eclipse.jface.viewers.IStructuredContentProvider;
  import org.eclipse.jface.viewers.Viewer;
--- 23,31 ----
   * 
   **********************************************************/
+ 
  package org.asdt.logger.internal;
  
! import java.util.List;
! 
  import org.eclipse.jface.viewers.IStructuredContentProvider;
  import org.eclipse.jface.viewers.Viewer;
***************
*** 34,42 ****
  public class ASLoggerContentProvider implements IStructuredContentProvider
  {
! 	private ArrayList content;
  	public void inputChanged(Viewer v, Object oldInput, Object newInput)
  	{
! 		if (newInput instanceof ArrayList)
! 			content = (ArrayList)newInput;
  	}
  
--- 36,45 ----
  public class ASLoggerContentProvider implements IStructuredContentProvider
  {
! 	private List content;
! 	
  	public void inputChanged(Viewer v, Object oldInput, Object newInput)
  	{
! 		if (newInput instanceof List)
! 			content = (List)newInput;
  	}
  
***************
*** 47,52 ****
  	public Object[] getElements(Object parent)
  	{
! 		if (content != null)
  			return content.toArray();
  		return new Object[0];
  	}
--- 50,56 ----
  	public Object[] getElements(Object parent)
  	{
! 		if (content != null) {
  			return content.toArray();
+ 		}
  		return new Object[0];
  	}

Index: ASLogger.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/internal/ASLogger.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ASLogger.java	7 Sep 2005 21:11:53 -0000	1.6
--- ASLogger.java	8 Sep 2005 08:56:41 -0000	1.7
***************
*** 35,38 ****
--- 35,39 ----
  /**
   * @author Peter Schreiber
+  * @author Boris Beaulant
   */
  public class ASLogger
***************
*** 110,113 ****
--- 111,115 ----
  		logReceiverList.add(logReceiver);
  		setCurrentClientLogReceiver(logReceiver);
+ 		fireClientLoggerCountChanged();
  	}
  
***************
*** 150,153 ****
--- 152,164 ----
  	}
  
+ 	public void fireClientLoggerCountChanged()
+ 	{
+ 		for (Iterator iter = loggerChangeListenerList.iterator(); iter.hasNext();)
+ 		{
+ 			ILoggerChangedListener listener = (ILoggerChangedListener) iter.next();
+ 			listener.clientLoggerCountChanged();
+ 		}
+ 	}
+ 	
  	public void clearTable()
  	{
***************
*** 179,182 ****
--- 190,194 ----
  		}
  		logReceiverList = newList;
+ 		fireClientLoggerCountChanged();
  	}
  
***************
*** 191,194 ****
--- 203,207 ----
  			}
  		}
+ 		fireClientLoggerCountChanged();
  	}
  }

Index: ClientLogReceiver.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/internal/ClientLogReceiver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ClientLogReceiver.java	5 Aug 2005 23:22:40 -0000	1.4
--- ClientLogReceiver.java	8 Sep 2005 08:56:41 -0000	1.5
***************
*** 30,34 ****
--- 30,37 ----
  import java.net.*;
  import java.util.ArrayList;
+ import java.util.Collections;
  import java.util.Date;
+ import java.util.List;
+ 
  import org.asdt.logger.ASLoggerPlugin;
  import org.asdt.logger.internal.LoggingElement;
***************
*** 45,49 ****
      private Socket client;
      private boolean active = true;
!     private ArrayList loggedElements;
      private boolean connected;
      private ASLogger loggerController;
--- 48,52 ----
      private Socket client;
      private boolean active = true;
!     private List loggedElements;
      private boolean connected;
      private ASLogger loggerController;
***************
*** 55,59 ****
      {
          this.client = client;
!         loggedElements = new ArrayList();
          this.loggerController = loggerController;
      }
--- 58,62 ----
      {
          this.client = client;
!         loggedElements = Collections.synchronizedList(new ArrayList());
          this.loggerController = loggerController;
      }
***************
*** 61,65 ****
      public void stopListening()
      {
-         
          try
          {
--- 64,67 ----
***************
*** 115,120 ****
              in.close();
          } 
-   
-         
      }
  
--- 117,120 ----
***************
*** 133,137 ****
          connected = false;
          //loggerController.updateClientList();
-         
      }
  
--- 133,136 ----
***************
*** 142,146 ****
      }
      
!     public ArrayList getLoggedElements()
      {
      	return loggedElements;
--- 141,145 ----
      }
      
!     public List getLoggedElements()
      {
      	return loggedElements;

[ASDT-cvs] org.asdt.logger/src/org/asdt/logger IASLoggerConstants.java,1.3,1.4

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

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

Modified Files:
	IASLoggerConstants.java 
Log Message:
Fix Out of Memory exception caused by images in logger

Index: IASLoggerConstants.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/IASLoggerConstants.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IASLoggerConstants.java	7 Sep 2005 17:21:16 -0000	1.3
--- IASLoggerConstants.java	8 Sep 2005 08:56:41 -0000	1.4
***************
*** 10,18 ****
      public final static String LOGGER_PATH_NAME = "logger";
      
-     public final static String IMAGE_LEVEL_ERROR = "icons/level_error.gif";
-     public final static String IMAGE_LEVEL_WARNING = "icons/level_warning.gif";
-     public final static String IMAGE_LEVEL_INFO = "icons/level_info.gif";
-     public final static String IMAGE_BLANK = "icons/blank.gif";
-     
      public final static String IMAGE_ACTION_STOP = "icons/stop.gif";
      public final static String IMAGE_ACTION_RUN = "icons/run.gif";
--- 10,13 ----
***************
*** 22,27 ****
      
      public final static String IMAGE_CLIENT_RUN = "icons/debugt_obj.gif";
!     
!     
! 	
  }
--- 17,20 ----
      
      public final static String IMAGE_CLIENT_RUN = "icons/debugt_obj.gif";
! 
  }

[ASDT-cvs] org.asdt.logger/icons level_error.gif,1.1,NONE level_info.gif,1.1,NONE level_warning.gif,1.1,NONE blank.gif,1.1,NONE

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

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

Removed Files:
	level_error.gif level_info.gif level_warning.gif blank.gif 
Log Message:
Fix Out of Memory exception caused by images in logger

--- level_error.gif DELETED ---

--- blank.gif DELETED ---

--- level_warning.gif DELETED ---

--- level_info.gif DELETED ---

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

[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-serv20435/src/org/asdt/logger/ui/actions

Modified Files:
	AddLoggerAction.java 
Log Message:
Fix some Logger bugs, and add 'Add/Remove AS Nature' and 'Link logger' in project popup menu

Index: AddLoggerAction.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/ui/actions/AddLoggerAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AddLoggerAction.java	7 Sep 2005 17:21:16 -0000	1.4
--- AddLoggerAction.java	7 Sep 2005 21:11:52 -0000	1.5
***************
*** 1,60 ****
  package org.asdt.logger.ui.actions;
  
- import java.net.URL;
  import java.util.List;
  import org.asdt.core.resources.ClasspathManager;
- import org.asdt.logger.ASLoggerPlugin;
  import org.asdt.logger.IASLoggerConstants;
  import org.eclipse.core.resources.IFolder;
- import org.eclipse.core.resources.IPathVariableManager;
- import org.eclipse.core.resources.IProject;
- import org.eclipse.core.resources.IWorkspaceRoot;
- import org.eclipse.core.resources.ResourcesPlugin;
- import org.eclipse.core.runtime.CoreException;
- import org.eclipse.core.runtime.IPath;
  import org.eclipse.core.runtime.Path;
- import org.eclipse.core.runtime.Platform;
  import org.eclipse.jface.action.IAction;
- import org.eclipse.jface.viewers.ISelection;
- import org.eclipse.jface.viewers.StructuredSelection;
- import org.eclipse.osgi.framework.internal.core.BundleHost;
- import org.eclipse.ui.IViewActionDelegate;
- import org.eclipse.ui.IViewPart;
- 
- public class AddLoggerAction implements IViewActionDelegate
- {
- 	IViewPart view;
- 	IProject project;
  
! 	public void init(IViewPart view)
! 	{
! 		this.view = view;
! 	}
  
! 	public void run(IAction action)
! 	{
! 		if (project != null)
! 		{
! 			try
! 			{
  				// Create the folder
  				IFolder loggerFolder = project.getFolder(IASLoggerConstants.LOGGER_PATH_NAME);
! 				if (!loggerFolder.exists())
! 				{
! 					loggerFolder.createLink(new Path(IASLoggerConstants.LOGGER_PATH_NAME), IFolder.ALLOW_MISSING_LOCAL,
! 							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);
  					}
- 					
  				}
! 				
! 			}
! 			catch (Exception e)
! 			{
  				e.printStackTrace();
  			}
--- 1,61 ----
+ /**********************************************************
+  * ActionScript Development Tool
+  * Copyright (C) 2005  asdt.org
+  * 
+  * 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 
+  * Free Software Foundation; either version 2 of the License, 
+  * or (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+  * See the GNU General Public License for more details.
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program; if not, write to the 
+  * Free Software Foundation, Inc., 
+  * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. 
+  * 
+  **********************************************************/
+ 
  package org.asdt.logger.ui.actions;
  
  import java.util.List;
+ 
+ import org.asdt.core.internal.ui.actions.AbstractProjectAction;
  import org.asdt.core.resources.ClasspathManager;
  import org.asdt.logger.IASLoggerConstants;
  import org.eclipse.core.resources.IFolder;
  import org.eclipse.core.runtime.Path;
  import org.eclipse.jface.action.IAction;
  
! /**
!  * 
!  * @author Boris Beaulant
!  *
!  */
! public class AddLoggerAction extends AbstractProjectAction {
  
! 	public void run(IAction action) {
! 		if (project != null) {
! 			try {
  				// Create the folder
  				IFolder loggerFolder = project.getFolder(IASLoggerConstants.LOGGER_PATH_NAME);
! 				if (!loggerFolder.exists()) {
! 					loggerFolder.createLink(new Path(IASLoggerConstants.LOGGER_PATH_NAME),
! 							IFolder.ALLOW_MISSING_LOCAL, 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);
  					}
  				}
! 			} catch (Exception e) {
  				e.printStackTrace();
  			}
***************
*** 62,76 ****
  	}
  
- 	public void selectionChanged(IAction action, ISelection selection)
- 	{
- 		if (selection instanceof StructuredSelection)
- 		{
- 			StructuredSelection structuredSelection = (StructuredSelection) selection;
- 			Object firstElement = structuredSelection.getFirstElement();
- 			if (firstElement instanceof IProject)
- 			{
- 				project = (IProject) firstElement;
- 			}
- 		}
- 	}
  }
--- 63,65 ----

[ASDT-cvs] org.asdt.logger/src/org/asdt/logger/ui/views ASLoggerView.java,1.7,1.8

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

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

Modified Files:
	ASLoggerView.java 
Log Message:
Fix some Logger bugs, and add 'Add/Remove AS Nature' and 'Link logger' in project popup menu

Index: ASLoggerView.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/ui/views/ASLoggerView.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ASLoggerView.java	7 Sep 2005 17:21:16 -0000	1.7
--- ASLoggerView.java	7 Sep 2005 21:11:53 -0000	1.8
***************
*** 45,52 ****
--- 45,56 ----
  import org.eclipse.core.runtime.Path;
  import org.eclipse.jface.action.Action;
+ import org.eclipse.jface.action.ContributionItem;
+ import org.eclipse.jface.action.ControlContribution;
+ import org.eclipse.jface.action.IContributionItem;
  import org.eclipse.jface.action.IMenuListener;
  import org.eclipse.jface.action.IMenuManager;
  import org.eclipse.jface.action.IToolBarManager;
  import org.eclipse.jface.action.MenuManager;
+ import org.eclipse.jface.action.Separator;
  import org.eclipse.jface.dialogs.MessageDialog;
  import org.eclipse.jface.viewers.ColumnWeightData;
***************
*** 74,77 ****
--- 78,83 ----
  import org.eclipse.swt.widgets.Text;
  import org.eclipse.ui.IActionBars;
+ import org.eclipse.ui.IWorkbenchActionConstants;
+ import org.eclipse.ui.actions.CompoundContributionItem;
  import org.eclipse.ui.part.ViewPart;
  
***************
*** 298,302 ****
  	private void hookContextMenu()
  	{
! 		MenuManager menuMgr = new MenuManager("#PopupMenu");
  		menuMgr.setRemoveAllWhenShown(true);
  		menuMgr.addMenuListener(new IMenuListener()
--- 304,308 ----
  	private void hookContextMenu()
  	{
! 		MenuManager menuMgr = new MenuManager(null);
  		menuMgr.setRemoveAllWhenShown(true);
  		menuMgr.addMenuListener(new IMenuListener()
***************
*** 327,330 ****
--- 333,338 ----
  	private void fillContextMenu(IMenuManager manager)
  	{
+ 		// Add addition separator to prevent PopupMenuExtender Warning
+ 		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
  		manager.add(stopAction);
  		manager.add(startAction);

[ASDT-cvs] org.asdt.logger/src/org/asdt/logger/internal ASLogger.java,1.5,1.6

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

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

Modified Files:
	ASLogger.java 
Log Message:
Fix some Logger bugs, and add 'Add/Remove AS Nature' and 'Link logger' in project popup menu

Index: ASLogger.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/internal/ASLogger.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ASLogger.java	5 Aug 2005 23:22:53 -0000	1.5
--- ASLogger.java	7 Sep 2005 21:11:53 -0000	1.6
***************
*** 69,79 ****
  	public void stopListening() throws IOException
  	{
! 		if (clientReceiverThread != null)
! 		{
  			clientReceiverThread.stop();
  			clientReceiverThread = null;
  		}
! 		clientReceiver.stopListening();
! 		clientReceiver = null;
  		stopAllLogReceivers();
  		logReceiverList = new ArrayList();
--- 69,80 ----
  	public void stopListening() throws IOException
  	{
! 		if (clientReceiverThread != null) {
  			clientReceiverThread.stop();
  			clientReceiverThread = null;
  		}
! 		if (clientReceiver != null) {
! 			clientReceiver.stopListening();
! 			clientReceiver = null;
! 		}
  		stopAllLogReceivers();
  		logReceiverList = new ArrayList();

[ASDT-cvs] org.asdt.logger plugin.xml,1.7,1.8 plugin.properties,1.1,1.2

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

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

Modified Files:
	plugin.xml plugin.properties 
Log Message:
Fix some Logger bugs, and add 'Add/Remove AS Nature' and 'Link logger' in project popup menu

Index: plugin.properties
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/plugin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** plugin.properties	29 Jul 2005 23:58:43 -0000	1.1
--- plugin.properties	7 Sep 2005 21:11:51 -0000	1.2
***************
*** 1 ****
! PopupMenu.AddLogger=Add Logger to Project
--- 1,2 ----
! View.name=AS Logger
! PopupMenu.action.addLogger=Link Logger classes

Index: plugin.xml
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/plugin.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** plugin.xml	7 Sep 2005 17:21:16 -0000	1.7
--- plugin.xml	7 Sep 2005 21:11:51 -0000	1.8
***************
*** 15,19 ****
              icon="icons/as_logger.gif"
              id="org.asdt.logger.ui.views.ASLoggerView"
!             name="AS Logger">
        </view>
     </extension>
--- 15,19 ----
              icon="icons/as_logger.gif"
              id="org.asdt.logger.ui.views.ASLoggerView"
!             name="%View.name">
        </view>
     </extension>
***************
*** 36,45 ****
  
        <viewerContribution
!             id="org.asdt.logger.viewerContribution1"
              targetID="org.eclipse.ui.views.ResourceNavigator">
-             <menu
-                id="org.asdt.logger.menu2"
-                label="Logger"
-                path="logger"/>
            <visibility>
              
--- 36,41 ----
  
        <viewerContribution
!             id="org.asdt.logger.viewerContribution"
              targetID="org.eclipse.ui.views.ResourceNavigator">
            <visibility>
              
***************
*** 55,62 ****
           <action
                 class="org.asdt.logger.ui.actions.AddLoggerAction"
!                definitionId="org.asdt.logger.ui.actions.AddLoggerAction"
                 id="org.asdt.logger.addLogger"
!                label="%PopupMenu.AddLogger"
!                menubarPath="logger"/>
                
        </viewerContribution>
--- 51,58 ----
           <action
                 class="org.asdt.logger.ui.actions.AddLoggerAction"
!                icon="icons/as_logger.gif"
                 id="org.asdt.logger.addLogger"
!                label="%PopupMenu.action.addLogger"
!                menubarPath="actionScript/actionScriptSlot"/>
                
        </viewerContribution>

[ASDT-cvs] org.asdt.core/src/org/asdt/core/internal/ui/actions AddProjectASNatureAction.java,NONE,1.1 AbstractProjectAction.java,NONE,1.1 RemoveProjectASNature.java,NONE,1.1

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

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

Added Files:
	AddProjectASNatureAction.java AbstractProjectAction.java 
	RemoveProjectASNature.java 
Log Message:
Fix some Logger bugs, and add 'Add/Remove AS Nature' and 'Link logger' in project popup menu

--- NEW FILE: AbstractProjectAction.java ---
/**********************************************************
 * ActionScript Development Tool
 * Copyright (C) 2005  asdt.org
 * 
 * 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 
 * Free Software Foundation; either version 2 of the License, 
 * or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful, 
 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
 * See the GNU General Public License for more details.
 * 
 * You should have received a copy of the GNU General Public License 
 * along with this program; if not, write to the 
 * Free Software Foundation, Inc., 
 * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. 
 * 
 **********************************************************/

package org.asdt.core.internal.ui.actions;

import org.eclipse.core.resources.IProject;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.ui.IViewActionDelegate;
import org.eclipse.ui.IViewPart;

/**
 * 
 * @author Boris Beaulant
 *
 */
public abstract class AbstractProjectAction implements IViewActionDelegate {

	protected IViewPart view;
	protected IProject project;

	public void init(IViewPart view) {
		this.view = view;
	}

	public void selectionChanged(IAction action, ISelection selection) {
		if (selection instanceof StructuredSelection)
		{
			StructuredSelection structuredSelection = (StructuredSelection) selection;
			Object firstElement = structuredSelection.getFirstElement();
			if (firstElement instanceof IProject)
			{
				project = (IProject) firstElement;
			}
		}
	}
}

--- NEW FILE: AddProjectASNatureAction.java ---
/**********************************************************
 * ActionScript Development Tool
 * Copyright (C) 2005  asdt.org
 * 
 * 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 
 * Free Software Foundation; either version 2 of the License, 
 * or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful, 
 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
 * See the GNU General Public License for more details.
 * 
 * You should have received a copy of the GNU General Public License 
 * along with this program; if not, write to the 
 * Free Software Foundation, Inc., 
 * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. 
 * 
 **********************************************************/

package org.asdt.core.internal.ui.actions;

import org.asdt.core.resources.natures.ASNature;
import org.eclipse.jface.action.IAction;

/**
 * 
 * @author Boris Beaulant
 *
 */
public class AddProjectASNatureAction extends AbstractProjectAction {

	public void run(IAction action) {
		if (project != null) {
			try {
				// Add actionscript nature to the selected project
				ASNature.addNature(project, null);
			} catch (Exception e) {
				e.printStackTrace();
			}
		}
	}
	
}

--- NEW FILE: RemoveProjectASNature.java ---
/**********************************************************
 * ActionScript Development Tool
 * Copyright (C) 2005  asdt.org
 * 
 * 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 
 * Free Software Foundation; either version 2 of the License, 
 * or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful, 
 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
 * See the GNU General Public License for more details.
 * 
 * You should have received a copy of the GNU General Public License 
 * along with this program; if not, write to the 
 * Free Software Foundation, Inc., 
 * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. 
 * 
 **********************************************************/

package org.asdt.core.internal.ui.actions;

import org.asdt.core.resources.natures.ASNature;
import org.eclipse.jface.action.IAction;

/**
 * 
 * @author Boris Beaulant
 *
 */
public class RemoveProjectASNature extends AbstractProjectAction {

	public void run(IAction action) {
		if (project != null) {
			try {
				// Remove actionscript nature to the selected project
				ASNature.removeNature(project, null);
			} catch (Exception e) {
				e.printStackTrace();
			}
		}
	}

}

[ASDT-cvs] org.asdt.core/src/org/asdt/core/resources/natures ASNature.java,1.5,1.6

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

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

Modified Files:
	ASNature.java 
Log Message:
Fix some Logger bugs, and add 'Add/Remove AS Nature' and 'Link logger' in project popup menu

Index: ASNature.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.core/src/org/asdt/core/resources/natures/ASNature.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ASNature.java	27 Jun 2005 14:54:37 -0000	1.5
--- ASNature.java	7 Sep 2005 21:11:46 -0000	1.6
***************
*** 26,29 ****
--- 26,33 ----
  package org.asdt.core.resources.natures;
  
+ import java.util.Arrays;
+ import java.util.Iterator;
+ import java.util.List;
+ 
  import org.asdt.core.IASCoreConstants;
  import org.eclipse.core.resources.IFolder;
***************
*** 38,42 ****
  
  /**
-  * 
   * @author Peter Schreiber
   */
--- 42,45 ----
***************
*** 100,106 ****
              project.setDescription(desc, monitor);
          }
- 
      }
  
      /*
       * (non-Javadoc)
--- 103,133 ----
              project.setDescription(desc, monitor);
          }
      }
  
+     /**
+      * Utility routine to remove ASNature to the project
+      */
+     public static synchronized void removeNature(IProject project, IProgressMonitor monitor) throws CoreException {
+     	if (project == null) {
+     		return;
+     	}
+     	
+     	IProjectDescription desc = project.getDescription();
+     	
+     	// Only remove the nature if it still has been added.
+     	if (project.hasNature(IASCoreConstants.AS_NATURE_ID) == true) {
+     		String[] natures = desc.getNatureIds();
+     		String[] newNatures = new String[natures.length - 1];
+     		for (int i = 0; i<natures.length; i++) {
+     			String nature = natures[i];
+     			if (!nature.equals(IASCoreConstants.AS_NATURE_ID)) {
+     				newNatures[i] = nature;
+     			}
+     		}
+     		desc.setNatureIds(newNatures);
+     		project.setDescription(desc, monitor);
+     	}
+     }
+     
      /*
       * (non-Javadoc)

[ASDT-cvs] org.asdt.core plugin.xml,1.14,1.15 plugin.properties,1.5,1.6

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

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

Modified Files:
	plugin.xml plugin.properties 
Log Message:
Fix some Logger bugs, and add 'Add/Remove AS Nature' and 'Link logger' in project popup menu

Index: plugin.properties
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.core/plugin.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** plugin.properties	27 Jun 2005 14:54:37 -0000	1.5
--- plugin.properties	7 Sep 2005 21:11:45 -0000	1.6
***************
*** 5,7 ****
  
  PreferencesPage.name=ActionScript2
! CorePathPreferencesPage.name=Core path
\ No newline at end of file
--- 5,11 ----
  
  PreferencesPage.name=ActionScript2
! CorePathPreferencesPage.name=Core path
! 
! PopupMenu.name=ActionScript
! PopupMenu.addASNatureAction=Add AS Nature
! PopupMenu.removeASNatureAction=Remove AS Nature

Index: plugin.xml
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.core/plugin.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** plugin.xml	23 Aug 2005 23:05:49 -0000	1.14
--- plugin.xml	7 Sep 2005 21:11:45 -0000	1.15
***************
*** 91,94 ****
--- 91,147 ----
        </content-type>
     </extension>
+    <extension
+          point="org.eclipse.ui.popupMenus">
+       <viewerContribution
+             id="org.asdt.core.ResourceNavigator.viewerContributionProject"
+             targetID="org.eclipse.ui.views.ResourceNavigator">
+ 		<menu
+                id="actionScript"
+                label="%PopupMenu.name">
+             <separator name="actionScriptSlot"/>
+          </menu>
+                   <visibility>
+             <objectClass name="org.eclipse.core.resources.IProject"/>
+          </visibility>
+       </viewerContribution>
+       <viewerContribution
+             id="org.asdt.core.ResourceNavigator.viewerContributionWithoutASNature"
+             targetID="org.eclipse.ui.views.ResourceNavigator">
+          <visibility>
+             <and>
+                <objectClass name="org.eclipse.core.resources.IProject"/>
+                <not>
+                   <objectState
+                         name="nature"
+                         value="org.asdt.core.ASNature"/>
+                </not>
+             </and>
+          </visibility>
+          <action
+                class="org.asdt.core.internal.ui.actions.AddProjectASNatureAction"
+                icon="icons/as_nature.gif"
+                id="org.asdt.core.addProjectASNatureAction"
+                label="%PopupMenu.addASNatureAction"
+                menubarPath="actionScript/actionScriptSlot"/>
+       </viewerContribution>
+       <viewerContribution
+             id="org.asdt.core.ResourceNavigator.viewerContributionWithASNature"
+             targetID="org.eclipse.ui.views.ResourceNavigator">
+          <visibility>
+             <and>
+                <objectState
+                      name="nature"
+                      value="org.asdt.core.ASNature"/>
+                <objectClass name="org.eclipse.core.resources.IProject"/>
+             </and>
+          </visibility>
+          <action
+                class="org.asdt.core.internal.ui.actions.RemoveProjectASNature"
+                icon="icons/as_nature.gif"
+                id="org.asdt.core.removeProjectASNatureAction"
+                label="%PopupMenu.removeASNatureAction"
+                menubarPath="actionScript/actionScriptSlot"/>
+       </viewerContribution>
+    </extension>
  
  </plugin>

[ASDT-cvs] org.asdt.core/icons as_nature.gif,NONE,1.1 eclipseFlash_16x16-alter.gif,1.1,NONE

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

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

Added Files:
	as_nature.gif 
Removed Files:
	eclipseFlash_16x16-alter.gif 
Log Message:
Fix some Logger bugs, and add 'Add/Remove AS Nature' and 'Link logger' in project popup menu

--- eclipseFlash_16x16-alter.gif DELETED ---

--- NEW FILE: as_nature.gif ---
(This appears to be a binary file; contents omitted.)

[ASDT-cvs] org.asdt-feature feature.xml,1.12,1.13

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

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

Modified Files:
	feature.xml 
Log Message:
build4

Index: feature.xml
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt-feature/feature.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** feature.xml	23 Aug 2005 23:18:11 -0000	1.12
--- feature.xml	7 Sep 2005 17:22:22 -0000	1.13
***************
*** 3,7 ****
        id="org.asdt.feature"
        label="ActionScript Development Tool (ASDT)"
!       version="0.0.8.build3"
        provider-name="asdt.org">
     <install-handler/>
--- 3,7 ----
        id="org.asdt.feature"
        label="ActionScript Development Tool (ASDT)"
!       version="0.0.8.build4"
        provider-name="asdt.org">
     <install-handler/>
***************
*** 63,67 ****
           download-size="0"
           install-size="0"
!          version="0.0.8.build3"/>
  
     <plugin
--- 63,67 ----
           download-size="0"
           install-size="0"
!          version="0.0.8.build4"/>
  
     <plugin
***************
*** 75,79 ****
           download-size="0"
           install-size="0"
!          version="0.0.8.build3"/>
  
     <plugin
--- 75,79 ----
           download-size="0"
           install-size="0"
!          version="0.0.8.build4"/>
  
     <plugin
***************
*** 87,91 ****
           download-size="0"
           install-size="0"
!          version="0.0.8.build3"/>
  
     <plugin
--- 87,91 ----
           download-size="0"
           install-size="0"
!          version="0.0.8.build4"/>
  
     <plugin

[ASDT-cvs] org.asdt.compiler plugin.xml,1.11,1.12

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

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

Modified Files:
	plugin.xml 
Log Message:
build4

Index: plugin.xml
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.compiler/plugin.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** plugin.xml	23 Aug 2005 23:18:37 -0000	1.11
--- plugin.xml	7 Sep 2005 17:21:58 -0000	1.12
***************
*** 4,8 ****
     id="org.asdt.compiler"
     name="%Plugin.name"
!    version="0.0.8.build3"
     provider-name="%Plugin.provider"
     class="org.asdt.compiler.ASCompilerPlugin">
--- 4,8 ----
     id="org.asdt.compiler"
     name="%Plugin.name"
!    version="0.0.8.build4"
     provider-name="%Plugin.provider"
     class="org.asdt.compiler.ASCompilerPlugin">

[ASDT-cvs] org.asdt.core/src/org/asdt/core/util toplevel.txt,NONE,1.1 ASTopLevel.java,NONE,1.1 internals.txt,1.1,NONE ASInternals.java,1.2,NONE

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

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

Added Files:
	toplevel.txt ASTopLevel.java 
Removed Files:
	internals.txt ASInternals.java 
Log Message:
Rename Internals to Toplevel ... 

--- ASInternals.java DELETED ---

--- NEW FILE: ASTopLevel.java ---
/**********************************************************
 * 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 
 * Free Software Foundation; either version 2 of the License, 
 * or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful, 
 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
 * See the GNU General Public License for more details.
 * 
 * You should have received a copy of the GNU General Public License 
 * along with this program; if not, write to the 
 * Free Software Foundation, Inc., 
 * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. 
 * 
 **********************************************************/

package org.asdt.core.util;


/**
 * Flash player built in objects and functions, e.g. _root, fscommand
 * @author Peter Schreiber
 * @author Boris Beaulant
 * @author Martin Wood
 */
public class ASTopLevel extends WordList{

	private static ASTopLevel asTopLevel;
	private String topLevelFile = "toplevel.txt";
	
	public ASTopLevel() {
		loadWordList(topLevelFile);
	}

	public static ASTopLevel getInstance() {
		if (asTopLevel == null) {
			asTopLevel = new ASTopLevel();
		}
		return asTopLevel;
	}
}
--- NEW FILE: toplevel.txt ---
isNaN
isFinite
setInterval
trace
escape
unescape
eval
fscommand
getProperty
getTimer
getVersion
newline
printAsBitmap
printAsBitmapNum
printNum
print
_global
_root
_level
_quality
_focusrect
_soundbuftime
Infinity
NaN
parseInt
parseFloat
updateAfterEvent
clearInterval
MMExecute
TRACE
getURL
random
int
string
chr
ord
loadMovie
loadVariables
targetPath
arguments
call
duplicateMovieClip
gotoAndPlay
gotoAndStop
loadMovieNum
loadVariablesNum
nextFrame
nextScene
play
prevFrame
prevScene
removeMovieClip
setProperty
startDrag
stop
stopAllSounds
stopDrag
toggleHighQuality
unloadMovie
unloadMovieNum

--- internals.txt DELETED ---

[ASDT-cvs] org.asdt.logger/src/org/asdt/logger/internal LoggingElement.java,1.5,1.6 ASLoggerLabelProvider.java,1.1,1.2

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

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

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

Index: ASLoggerLabelProvider.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/internal/ASLoggerLabelProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ASLoggerLabelProvider.java	13 Jul 2005 22:05:46 -0000	1.1
--- ASLoggerLabelProvider.java	7 Sep 2005 17:21:16 -0000	1.2
***************
*** 35,75 ****
   * @author Peter Schreiber
   */
! public class ASLoggerLabelProvider extends LabelProvider implements ITableLabelProvider
! {
! 	
  	SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
! 	
! 	public String getColumnText(Object obj, int index)
! 	{
  		LoggingElement loggingElement = (LoggingElement) obj;
! 		
! 		switch (index)
! 		{
! 		case 0:
! 			if (loggingElement.getTimestamp() != null)
! 				return dateFormat.format(loggingElement.getTimestamp()) + "," + loggingElement.getTimestamp().getTime()
! 						% 1000;
! 			else
! 				return "???";
! 		case 1:
! 			return loggingElement.getLevelText();
! 		case 2:
! 			return loggingElement.getMessage();
! 		case 3:
! 			return loggingElement.getClassname();
! 		case 4:
! 			return loggingElement.getLine() + "";
! 		default:
! 			return "--";
  		}
  	}
  
! 	public Image getColumnImage(Object obj, int index)
! 	{
! 		return null;// getImage(obj);
  	}
  
! 	public Image getImage(Object obj)
! 	{
  		return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_ELEMENT);
  	}
--- 35,76 ----
   * @author Peter Schreiber
   */
! public class ASLoggerLabelProvider extends LabelProvider implements ITableLabelProvider {
! 
  	SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
! 
! 	public String getColumnText(Object obj, int index) {
  		LoggingElement loggingElement = (LoggingElement) obj;
! 
! 		switch (index) {
! 			// Message
! 			case 0:
! 				return loggingElement.getMessage();
! 				
! 			// Class
! 			case 1:
! 				return loggingElement.getClassname();
! 				
! 			// Line
! 			case 2:
! 				return loggingElement.getLine() + "";
! 				
! 			// Time
! 			case 3:
! 				return loggingElement.getTime();
! 				
! 			default:
! 				return "--";
  		}
  	}
  
! 	public Image getColumnImage(Object obj, int index) {
! 		if ((index == 0) && (obj instanceof LoggingElement)) {
! 			LoggingElement logginElement = (LoggingElement) obj;
! 			return logginElement.getImage();
! 		}
! 		return null;
  	}
  
! 	public Image getImage(Object obj) {
  		return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_ELEMENT);
  	}

Index: LoggingElement.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/internal/LoggingElement.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LoggingElement.java	5 Aug 2005 23:22:53 -0000	1.5
--- LoggingElement.java	7 Sep 2005 17:21:16 -0000	1.6
***************
*** 25,44 ****
  package org.asdt.logger.internal;
  
- import java.io.StringBufferInputStream;
  import java.io.StringReader;
  import java.util.Date;
  import java.util.Iterator;
  import java.util.List;
  import org.jdom.Document;
  import org.jdom.Element;
- import org.jdom.JDOMException;
- import org.jdom.input.DOMBuilder;
  import org.jdom.input.SAXBuilder;
  
  /**
   * @author Peter Schreiber
   */
! public class LoggingElement
! {
  	public static final int NONE = 0;
  	public static final int INFO = 4;
--- 25,47 ----
  package org.asdt.logger.internal;
  
  import java.io.StringReader;
+ import java.text.SimpleDateFormat;
  import java.util.Date;
  import java.util.Iterator;
  import java.util.List;
+ 
+ import org.asdt.logger.ASLoggerPlugin;
+ import org.asdt.logger.IASLoggerConstants;
+ import org.eclipse.swt.graphics.Image;
  import org.jdom.Document;
  import org.jdom.Element;
  import org.jdom.input.SAXBuilder;
  
  /**
   * @author Peter Schreiber
+  * @author Boris Beaulant
   */
! public class LoggingElement {
! 	
  	public static final int NONE = 0;
  	public static final int INFO = 4;
***************
*** 46,49 ****
--- 49,53 ----
  	public static final int ERROR = 1;
  	public static final int VERBOSE = 7;
+ 	
  	private int level;
  	private String message;
***************
*** 55,157 ****
  	private int line;
  
! 	public int getLevel()
! 	{
  		return level;
  	}
  
! 	public String getLevelText()
! 	{
! 		switch (getLevel())
! 		{
! 		case NONE:
! 			return "NONE";
! 		case INFO:
! 			return "INFO";
! 		case WARNING:
! 			return "WARNING";
! 		case ERROR:
! 			return "ERROR";
! 		case VERBOSE:
! 			return "VERBOSE";
! 		default:
! 			return null;
! 		}
! 	}
! 
! 	public String getLogger()
! 	{
  		return logger;
  	}
  
! 	public String getMessage()
! 	{
  		return message;
  	}
  
! 	public Date getTimestamp()
! 	{
  		return timestamp;
  	}
  
! 	public String getClient()
! 	{
  		return client;
  	}
  
! 	public void setClient(String client)
! 	{
  		this.client = client;
  	}
  
! 	public void setLevel(int level)
! 	{
  		this.level = level;
  	}
  
! 	public void setLogger(String logger)
! 	{
  		this.logger = logger;
  	}
  
! 	public void setMessage(String message)
! 	{
  		this.message = message;
  	}
  
! 	public void setTimestamp(Date timestamp)
! 	{
  		this.timestamp = timestamp;
  	}
  
! 	public String getClassname()
! 	{
  		return classname;
  	}
  
! 	public void setClassname(String classname)
! 	{
  		this.classname = classname;
  	}
  
! 	public String getFilename()
! 	{
  		return filename;
  	}
  
! 	public void setFilename(String filename)
! 	{
  		this.filename = filename;
  	}
  
! 	public int getLine()
! 	{
  		return line;
  	}
  
! 	public void setLine(int line)
! 	{
  		this.line = line;
  	}
  
  	/**
  	 * parse XML to LoggingElement
--- 59,152 ----
  	private int line;
  
! 	public int getLevel() {
  		return level;
  	}
  
! 	public String getLogger() {
  		return logger;
  	}
  
! 	public String getMessage() {
  		return message;
  	}
  
! 	public Date getTimestamp() {
  		return timestamp;
  	}
  
! 	public String getClient() {
  		return client;
  	}
  
! 	public void setClient(String client) {
  		this.client = client;
  	}
  
! 	public void setLevel(int level) {
  		this.level = level;
  	}
  
! 	public void setLogger(String logger) {
  		this.logger = logger;
  	}
  
! 	public void setMessage(String message) {
  		this.message = message;
  	}
  
! 	public void setTimestamp(Date timestamp) {
  		this.timestamp = timestamp;
  	}
  
! 	public String getTime() {
! 		if (getTimestamp() != null) {
! 			SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
! 			return dateFormat.format(getTimestamp()) + "," + getTimestamp().getTime() % 1000;
! 		} else {
! 			return "???";
! 		}
! 	}
! 
! 	public String getClassname() {
  		return classname;
  	}
  
! 	public void setClassname(String classname) {
  		this.classname = classname;
  	}
  
! 	public String getFilename() {
  		return filename;
  	}
  
! 	public void setFilename(String filename) {
  		this.filename = filename;
  	}
  
! 	public int getLine() {
  		return line;
  	}
  
! 	public void setLine(int line) {
  		this.line = line;
  	}
  
+ 	public Image getImage() {
+ 		switch (getLevel()) {
+ 			case ERROR:
+ 				return ASLoggerPlugin.getImageDescriptor(IASLoggerConstants.IMAGE_LEVEL_ERROR)
+ 						.createImage();
+ 			case WARNING:
+ 				return ASLoggerPlugin.getImageDescriptor(IASLoggerConstants.IMAGE_LEVEL_WARNING)
+ 						.createImage();
+ 			case INFO:
+ 				return ASLoggerPlugin.getImageDescriptor(IASLoggerConstants.IMAGE_LEVEL_INFO)
+ 						.createImage();
+ 			default:
+ 				return ASLoggerPlugin.getImageDescriptor(IASLoggerConstants.IMAGE_BLANK)
+ 				.createImage();
+ 		}
+ 	}
+ 
  	/**
  	 * parse XML to LoggingElement
***************
*** 159,166 ****
  	 * @param xml
  	 */
! 	public synchronized void parseXML(String xml) throws Exception
! 	{
! 		if (xml != null && !xml.equals(""))
! 		{
  			StringReader myReader = new StringReader(xml);
  			SAXBuilder builder = new SAXBuilder();
--- 154,159 ----
  	 * @param xml
  	 */
! 	public synchronized void parseXML(String xml) throws Exception {
! 		if (xml != null && !xml.equals("")) {
  			StringReader myReader = new StringReader(xml);
  			SAXBuilder builder = new SAXBuilder();
***************
*** 168,175 ****
  			List childern = doc.getContent();
  			// List childern = root.getChildren();
! 			for (Iterator iter = childern.iterator(); iter.hasNext();)
! 			{
  				Element child = (Element) iter.next();
! 				if (child.getAttributeValue("level") != null && child.getAttributeValue("level").trim().length() > 0)
  					level = new Integer(child.getAttributeValue("level")).intValue();
  				if (child.getAttributeValue("timestamp") != null
--- 161,168 ----
  			List childern = doc.getContent();
  			// List childern = root.getChildren();
! 			for (Iterator iter = childern.iterator(); iter.hasNext();) {
  				Element child = (Element) iter.next();
! 				if (child.getAttributeValue("level") != null
! 						&& child.getAttributeValue("level").trim().length() > 0)
  					level = new Integer(child.getAttributeValue("level")).intValue();
  				if (child.getAttributeValue("timestamp") != null
***************
*** 180,184 ****
  				filename = child.getAttributeValue("fileName");
  				classname = child.getAttributeValue("className");
! 				if (child.getAttributeValue("line") != null && child.getAttributeValue("line").trim().length() > 0)
  					line = new Integer(child.getAttributeValue("line")).intValue();
  			}
--- 173,178 ----
  				filename = child.getAttributeValue("fileName");
  				classname = child.getAttributeValue("className");
! 				if (child.getAttributeValue("line") != null
! 						&& child.getAttributeValue("line").trim().length() > 0)
  					line = new Integer(child.getAttributeValue("line")).intValue();
  			}
***************
*** 186,193 ****
  	}
  
! 	public String toString()
! 	{
! 		return "";// getTimestamp().getHours()+":"+getTimestamp().getMinutes()+":"+getTimestamp().getSeconds()+ ","+
! 					// getTimestamp().getTime()%1000 + "\t" + getLevelText() + "\t" + message;
  	}
  }
--- 180,188 ----
  	}
  
! 	public String toString() {
! 		return "";// getTimestamp().getHours()+":"+getTimestamp().getMinutes()+":"+getTimestamp().getSeconds()+
! 					// ","+
! 		// getTimestamp().getTime()%1000 + "\t" + getLevelText() + "\t" +
! 		// message;
  	}
  }

[ASDT-cvs] org.asdt.logger/icons level_warning.gif,NONE,1.1 blank.gif,NONE,1.1 level_error.gif,NONE,1.1 level_info.gif,NONE,1.1 as_logger.gif,NONE,1.1 toc_closed.gif,1.1,NONE logfileviewer.gif,1.1,NONE

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

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

Added Files:
	level_warning.gif blank.gif level_error.gif level_info.gif 
	as_logger.gif 
Removed Files:
	toc_closed.gif logfileviewer.gif 
Log Message:
Expend logger functionnalities
- double click > open file
- icons
- ...

--- NEW FILE: level_error.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: blank.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: as_logger.gif ---
(This appears to be a binary file; contents omitted.)

--- logfileviewer.gif DELETED ---

--- NEW FILE: level_info.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: level_warning.gif ---
(This appears to be a binary file; contents omitted.)

--- toc_closed.gif DELETED ---

[ASDT-cvs] org.asdt.logger/src/org/asdt/logger/ui/views ASLoggerView.java,1.6,1.7

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

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

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

Index: ASLoggerView.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/ui/views/ASLoggerView.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ASLoggerView.java	25 Jul 2005 20:52:32 -0000	1.6
--- ASLoggerView.java	7 Sep 2005 17:21:16 -0000	1.7
***************
*** 25,31 ****
--- 25,36 ----
  package org.asdt.logger.ui.views;
  
+ import java.io.File;
+ import java.text.MessageFormat;
  import java.util.ArrayList;
+ 
+ import org.asdt.editor.util.ASFileOpener;
  import org.asdt.logger.ASLoggerMessages;
  import org.asdt.logger.ASLoggerPlugin;
+ import org.asdt.logger.IASLoggerConstants;
  import org.asdt.logger.internal.ASLoggerContentProvider;
  import org.asdt.logger.internal.ASLoggerLabelProvider;
***************
*** 35,38 ****
--- 40,47 ----
  import org.asdt.logger.internal.LoggingElement;
  import org.asdt.logger.ui.actions.ASLoggerClientSelectionAction;
+ import org.eclipse.core.resources.IFile;
+ import org.eclipse.core.resources.IWorkspace;
+ import org.eclipse.core.resources.ResourcesPlugin;
+ import org.eclipse.core.runtime.Path;
  import org.eclipse.jface.action.Action;
  import org.eclipse.jface.action.IMenuListener;
***************
*** 69,72 ****
--- 78,82 ----
  /**
   * @author Peter Schreiber
+  * @author Boris Beaulant
   */
  public class ASLoggerView extends ViewPart
***************
*** 129,144 ****
  	private Table createTable(Composite parent)
  	{
- 		
  		Table table = new Table(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
  		TableLayout tableLayout = new TableLayout();
  		table.setLayout(tableLayout);
! 		table.setLinesVisible(true);
  		table.setHeaderVisible(true);
! 		String[] STD_HEADINGS = { ASLoggerMessages.getString("Loggertable.time"),
! 				ASLoggerMessages.getString("Loggertable.level"), ASLoggerMessages.getString("Loggertable.message"),
! 				ASLoggerMessages.getString("Loggertable.class"), ASLoggerMessages.getString("Loggertable.line") };
! 		for (int i = 0; i < STD_HEADINGS.length; i++)
! 		{
! 			tableLayout.addColumnData(new ColumnWeightData(5, 40, true));
  			TableColumn tc0 = new TableColumn(table, SWT.NONE);
  			tc0.setText(STD_HEADINGS[i]);
--- 139,161 ----
  	private Table createTable(Composite parent)
  	{
  		Table table = new Table(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
  		TableLayout tableLayout = new TableLayout();
  		table.setLayout(tableLayout);
! 		table.setLinesVisible(false);
  		table.setHeaderVisible(true);
! 		
! 		// Headings titles
! 		String[] STD_HEADINGS = { 
! 				ASLoggerMessages.getString("Loggertable.message"),
! 				ASLoggerMessages.getString("Loggertable.class"),
! 				ASLoggerMessages.getString("Loggertable.line"),
! 				ASLoggerMessages.getString("Loggertable.time")};
! 		
! 		// Headings weights
! 		int[] WEIGHT_HEADINGS = {10, 5, 1, 3};
! 		
! 		// Heading construction
! 		for (int i = 0; i < STD_HEADINGS.length; i++) {
! 			tableLayout.addColumnData(new ColumnWeightData(WEIGHT_HEADINGS[i], 40, true));
  			TableColumn tc0 = new TableColumn(table, SWT.NONE);
  			tc0.setText(STD_HEADINGS[i]);
***************
*** 146,149 ****
--- 163,167 ----
  			tc0.setResizable(true);
  		}
+ 		
  		GridData gridData = new GridData();
  		gridData.horizontalAlignment = GridData.FILL;
***************
*** 252,273 ****
  				switch (combo.getSelectionIndex())
  				{
! 				case 0:
! 					loggerFilter.setLevel(LoggingElement.VERBOSE);
! 					break;
! 				case 1:
! 					loggerFilter.setLevel(LoggingElement.INFO);
! 					break;
! 				case 2:
! 					loggerFilter.setLevel(LoggingElement.WARNING);
! 					break;
! 				case 3:
! 					loggerFilter.setLevel(LoggingElement.ERROR);
! 					break;
! 				case 4:
! 					loggerFilter.setLevel(LoggingElement.NONE);
! 					break;
! 				default:
! 					loggerFilter.setLevel(LoggingElement.VERBOSE);
! 					break;
  				}
  				updateView();
--- 270,291 ----
  				switch (combo.getSelectionIndex())
  				{
! 					case 0:
! 						loggerFilter.setLevel(LoggingElement.VERBOSE);
! 						break;
! 					case 1:
! 						loggerFilter.setLevel(LoggingElement.INFO);
! 						break;
! 					case 2:
! 						loggerFilter.setLevel(LoggingElement.WARNING);
! 						break;
! 					case 3:
! 						loggerFilter.setLevel(LoggingElement.ERROR);
! 						break;
! 					case 4:
! 						loggerFilter.setLevel(LoggingElement.NONE);
! 						break;
! 					default:
! 						loggerFilter.setLevel(LoggingElement.VERBOSE);
! 						break;
  				}
  				updateView();
***************
*** 305,309 ****
  		manager.add(stopAction);
  		manager.add(startAction);
- 		
  	}
  
--- 323,326 ----
***************
*** 322,330 ****
  		manager.add(clientSelectionItem);
  		manager.add(removeUnusedAction);
- 		
  	}
  
  	private void makeActions()
  	{
  		stopAction = new Action()
  		{
--- 339,347 ----
  		manager.add(clientSelectionItem);
  		manager.add(removeUnusedAction);
  	}
  
  	private void makeActions()
  	{
+ 		// Stop action
  		stopAction = new Action()
  		{
***************
*** 346,351 ****
  		stopAction.setText(ASLoggerMessages.getString("StopButton.text"));
  		stopAction.setToolTipText(ASLoggerMessages.getString("StopButton.tooltip"));
! 		stopAction.setImageDescriptor(ASLoggerPlugin.getImageDescriptor("icons/stop.gif"));
  		stopAction.setEnabled(false);
  		startAction = new Action()
  		{
--- 363,370 ----
  		stopAction.setText(ASLoggerMessages.getString("StopButton.text"));
  		stopAction.setToolTipText(ASLoggerMessages.getString("StopButton.tooltip"));
! 		stopAction.setImageDescriptor(ASLoggerPlugin.getImageDescriptor(IASLoggerConstants.IMAGE_ACTION_STOP));
  		stopAction.setEnabled(false);
+ 		
+ 		// Start action
  		startAction = new Action()
  		{
***************
*** 359,364 ****
  		startAction.setText(ASLoggerMessages.getString("StartButton.text"));
  		startAction.setToolTipText(ASLoggerMessages.getString("StartButton.tooltip"));
! 		startAction.setImageDescriptor(ASLoggerPlugin.getImageDescriptor("icons/run.gif"));
! 		//
  		clearTableAction = new Action()
  		{
--- 378,384 ----
  		startAction.setText(ASLoggerMessages.getString("StartButton.text"));
  		startAction.setToolTipText(ASLoggerMessages.getString("StartButton.tooltip"));
! 		startAction.setImageDescriptor(ASLoggerPlugin.getImageDescriptor(IASLoggerConstants.IMAGE_ACTION_RUN));
! 		
! 		// Clear action
  		clearTableAction = new Action()
  		{
***************
*** 370,375 ****
  		clearTableAction.setText(ASLoggerMessages.getString("ClearButton.text"));
  		clearTableAction.setToolTipText(ASLoggerMessages.getString("ClearButton.tooltip"));
! 		clearTableAction.setImageDescriptor(ASLoggerPlugin.getImageDescriptor("icons/clear_co.png"));
! 		//
  		removeUnusedAction = new Action()
  		{
--- 390,396 ----
  		clearTableAction.setText(ASLoggerMessages.getString("ClearButton.text"));
  		clearTableAction.setToolTipText(ASLoggerMessages.getString("ClearButton.tooltip"));
! 		clearTableAction.setImageDescriptor(ASLoggerPlugin.getImageDescriptor(IASLoggerConstants.IMAGE_ACTION_CLEAR));
! 		
! 		// Remove unused action
  		removeUnusedAction = new Action()
  		{
***************
*** 381,386 ****
  		removeUnusedAction.setText(ASLoggerMessages.getString("RemoveUnusedButton.text"));
  		removeUnusedAction.setToolTipText(ASLoggerMessages.getString("RemoveUnusedButton.tooltip"));
! 		removeUnusedAction.setImageDescriptor(ASLoggerPlugin.getImageDescriptor("icons/rem_all_co.png"));
! 		//
  		doubleClickAction = new Action()
  		{
--- 402,408 ----
  		removeUnusedAction.setText(ASLoggerMessages.getString("RemoveUnusedButton.text"));
  		removeUnusedAction.setToolTipText(ASLoggerMessages.getString("RemoveUnusedButton.tooltip"));
! 		removeUnusedAction.setImageDescriptor(ASLoggerPlugin.getImageDescriptor(IASLoggerConstants.IMAGE_ACTION_REMOVE_UNUSED));
! 		
! 		// DoubleClick action
  		doubleClickAction = new Action()
  		{
***************
*** 389,396 ****
  				ISelection selection = viewer.getSelection();
  				Object obj = ((IStructuredSelection) selection).getFirstElement();
! 				showMessage("Double-click detected on " + obj.toString());
  			}
  		};
  		clientSelectionItem = new ASLoggerClientSelectionAction();
  	}
  
--- 411,440 ----
  				ISelection selection = viewer.getSelection();
  				Object obj = ((IStructuredSelection) selection).getFirstElement();
! 				if (obj instanceof LoggingElement) {
! 					LoggingElement logginElement = (LoggingElement) obj;
! 					
! 				    // Open the file
! 					String fileName = logginElement.getFilename();
! 					File f = new File(fileName);
! 					Path path = new Path(f.getAbsolutePath());
! 					IWorkspace w = ResourcesPlugin.getWorkspace();
! 					IFile file = w.getRoot().getFileForLocation(path);
! 					if (file == null) {
! 						// Display error message
! 						MessageDialog.openError(viewer.getControl().getShell(), ASLoggerMessages
! 								.getString("error.title"), MessageFormat.format(ASLoggerMessages
! 								.getString("error.cantLoadFile"), new String[] { logginElement
! 								.getFilename() }));
! 					} else {
! 						// Open the file in editor and place cursor on logginElement line
! 						ASFileOpener.openASFile(file, logginElement.getLine(), 0, 0);
! 					}
! 				}
  			}
  		};
+ 		
+ 		// Client selection action
  		clientSelectionItem = new ASLoggerClientSelectionAction();
+ 		clientSelectionItem.setToolTipText(ASLoggerMessages.getString("clientSelection.tooltip"));
  	}
  
***************
*** 406,414 ****
  	}
  
- 	private void showMessage(String message)
- 	{
- 		MessageDialog.openInformation(viewer.getControl().getShell(), "AS Logger", message);
- 	}
- 
  	/**
  	 * Passing the focus request to the viewer's control.
--- 450,453 ----
***************
*** 426,437 ****
  			public void run()
  			{
! 				ArrayList loggedElements = new ArrayList();
! 				if (cll != null)
! 				{
! 					loggedElements = cll.getLoggedElements();
  				}
- 				viewer.setInput(loggedElements);
- 				lblStatusText.setText(ASLoggerMessages.getString("StatusLabel.text") + loggedElements.size());
- 				
  			}
  		});
--- 465,484 ----
  			public void run()
  			{
! 				try {
! 					ArrayList loggedElements = new ArrayList();
! 					if (cll != null)
! 					{
! 						loggedElements = cll.getLoggedElements();
! 						viewer.setInput(loggedElements);
! 						lblStatusText.setText(MessageFormat.format(ASLoggerMessages
! 								.getString("StatusLabel.text"), new String[] { Integer
! 								.toString(loggedElements.size()) }));
! 					} else {
! 						viewer.setInput(new ArrayList());
! 					}
! 					clientSelectionItem.setEnabled(clientSelectionItem.isEnabled());
! 				} catch (Exception e) {
! 					e.printStackTrace();
  				}
  			}
  		});

[ASDT-cvs] org.asdt.logger/src/org/asdt/logger ASLoggerMessages.properties,1.3,1.4 ASLoggerPlugin.java,1.2,1.3 IASLoggerConstants.java,1.2,1.3

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

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

Modified Files:
	ASLoggerMessages.properties ASLoggerPlugin.java 
	IASLoggerConstants.java 
Log Message:
Expend logger functionnalities
- double click > open file
- icons
- ...

Index: IASLoggerConstants.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/IASLoggerConstants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IASLoggerConstants.java	4 Aug 2005 16:51:49 -0000	1.2
--- IASLoggerConstants.java	7 Sep 2005 17:21:16 -0000	1.3
***************
*** 10,13 ****
--- 10,26 ----
      public final static String LOGGER_PATH_NAME = "logger";
      
+     public final static String IMAGE_LEVEL_ERROR = "icons/level_error.gif";
+     public final static String IMAGE_LEVEL_WARNING = "icons/level_warning.gif";
+     public final static String IMAGE_LEVEL_INFO = "icons/level_info.gif";
+     public final static String IMAGE_BLANK = "icons/blank.gif";
+     
+     public final static String IMAGE_ACTION_STOP = "icons/stop.gif";
+     public final static String IMAGE_ACTION_RUN = "icons/run.gif";
+     public final static String IMAGE_ACTION_CLEAR = "icons/clear_co.png";
+     public final static String IMAGE_ACTION_REMOVE_UNUSED = "icons/rem_all_co.png";
+     public final static String IMAGE_ACTION_CLIENT_SELECTION = "icons/as_logger.gif";
+     
+     public final static String IMAGE_CLIENT_RUN = "icons/debugt_obj.gif";
+     
      
  	

Index: ASLoggerPlugin.java
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/ASLoggerPlugin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ASLoggerPlugin.java	4 Aug 2005 21:29:57 -0000	1.2
--- ASLoggerPlugin.java	7 Sep 2005 17:21:16 -0000	1.3
***************
*** 26,31 ****
  
  import java.net.URL;
  import org.asdt.logger.internal.ASLogger;
- import org.eclipse.core.resources.IFile;
  import org.eclipse.core.resources.IPathVariableManager;
  import org.eclipse.core.resources.ResourcesPlugin;
--- 26,31 ----
  
  import java.net.URL;
+ 
  import org.asdt.logger.internal.ASLogger;
  import org.eclipse.core.resources.IPathVariableManager;
  import org.eclipse.core.resources.ResourcesPlugin;

Index: ASLoggerMessages.properties
===================================================================
RCS file: /cvsroot/aseclipseplugin/org.asdt.logger/src/org/asdt/logger/ASLoggerMessages.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ASLoggerMessages.properties	29 Jul 2005 23:58:43 -0000	1.3
--- ASLoggerMessages.properties	7 Sep 2005 17:21:16 -0000	1.4
***************
*** 13,17 ****
  RemoveUnusedButton.text=Remove Unused Clients
  RemoveUnusedButton.tooltip=Remove unused clients from list
! StatusLabel.text=Logs captured: 
  
! AddLogger=Add Logger to Project
\ No newline at end of file
--- 13,21 ----
  RemoveUnusedButton.text=Remove Unused Clients
  RemoveUnusedButton.tooltip=Remove unused clients from list
! StatusLabel.text=Logs captured :  {0} 
! clientSelection.tooltip=Select client 
  
! AddLogger=Add Logger to Project
! 
! error.title=AS Logger
! error.cantLoadFile=Can't load file : {0}
\ No newline at end of file