[Rubyeclipse-commit] org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui RubyPluginImages.java,1.13,1.14 RubyPlugin.java,1.23,1.24

[Christopher W. <caw...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28822/src/org/rubypeople/rdt/internal/ui

Modified Files:
	RubyPluginImages.java RubyPlugin.java 
Log Message:
overhaul our completion proposal/template code. Now we will apply formatting to templates when inserted! Plus we're closer to the way JDT does things. We still can't use the actual code formatter on the templates (because our old one does a massive replace edit which messes up variables like the cursor placement). The end result is that users should create templates with somewhat proper formatting initially.

Index: RubyPluginImages.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/RubyPluginImages.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** RubyPluginImages.java	10 Feb 2006 20:14:19 -0000	1.13
--- RubyPluginImages.java	18 Feb 2006 16:53:50 -0000	1.14
***************
*** 56,60 ****
      private static final String IMG_CTOOLS_RUBY_IMPORT_CONTAINER = NAME_PREFIX + "imp_c.gif";
      private static final String IMG_CTOOLS_RUBY_IMPORT = NAME_PREFIX + "imp_obj.gif";
!     public static final String IMG_TEMPLATE_PROPOSAL = NAME_PREFIX + "template_obj.gif";
      private static final String IMG_CTOOLS_RUBY_LOCAL_VAR = NAME_PREFIX + "localvariable_obj.gif";
      public static final String IMG_CTOOLS_RUBY_PAGE = NAME_PREFIX + "ruby_page.gif";
--- 56,60 ----
      private static final String IMG_CTOOLS_RUBY_IMPORT_CONTAINER = NAME_PREFIX + "imp_c.gif";
      private static final String IMG_CTOOLS_RUBY_IMPORT = NAME_PREFIX + "imp_obj.gif";
!     public static final String IMG_OBJS_TEMPLATE = NAME_PREFIX + "template_obj.gif";
      private static final String IMG_CTOOLS_RUBY_LOCAL_VAR = NAME_PREFIX + "localvariable_obj.gif";
      public static final String IMG_CTOOLS_RUBY_PAGE = NAME_PREFIX + "ruby_page.gif";
***************
*** 128,132 ****
      
      public static final ImageDescriptor DESC_OBJS_UNKNOWN= createManaged(T_OBJ, IMG_OBJS_UNKNOWN);
!     
      
  	static {
--- 128,132 ----
      
      public static final ImageDescriptor DESC_OBJS_UNKNOWN= createManaged(T_OBJ, IMG_OBJS_UNKNOWN);
!        
      
  	static {
***************
*** 136,140 ****
  		createManaged(T_OBJ, IMG_OBJS_WARNING);
  		createManaged(T_OBJ, IMG_OBJS_INFO);
! 		createManaged(T_OBJ, IMG_TEMPLATE_PROPOSAL);
  		createManaged(T_CTOOL, IMG_CTOOLS_RUBY_IMPORT_CONTAINER);
  		createManaged(T_CTOOL, IMG_CTOOLS_RUBY_IMPORT);
--- 136,140 ----
  		createManaged(T_OBJ, IMG_OBJS_WARNING);
  		createManaged(T_OBJ, IMG_OBJS_INFO);
! 		createManaged(T_OBJ, IMG_OBJS_TEMPLATE);
  		createManaged(T_CTOOL, IMG_CTOOLS_RUBY_IMPORT_CONTAINER);
  		createManaged(T_CTOOL, IMG_CTOOLS_RUBY_IMPORT);

Index: RubyPlugin.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/RubyPlugin.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** RubyPlugin.java	10 Feb 2006 20:14:19 -0000	1.23
--- RubyPlugin.java	18 Feb 2006 16:53:50 -0000	1.24
***************
*** 55,59 ****
  import org.rubypeople.rdt.internal.ui.rubyeditor.RubyDocumentProvider;
  import org.rubypeople.rdt.internal.ui.rubyeditor.WorkingCopyManager;
- import org.rubypeople.rdt.internal.ui.rubyeditor.templates.RubyTemplateAccess;
  import org.rubypeople.rdt.internal.ui.symbols.BlockingSymbolFinder;
  import org.rubypeople.rdt.internal.ui.text.IRubyColorConstants;
--- 55,58 ----
***************
*** 61,64 ****
--- 60,64 ----
  import org.rubypeople.rdt.internal.ui.text.RubyTextTools;
  import org.rubypeople.rdt.internal.ui.text.folding.RubyFoldingStructureProviderRegistry;
+ import org.rubypeople.rdt.internal.ui.text.template.contentassist.RubyTemplateAccess;
  import org.rubypeople.rdt.ui.IWorkingCopyManager;
  import org.rubypeople.rdt.ui.PreferenceConstants;