[Rubyeclipse-commit] org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor RubyEditor.java,1.44,1.45

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

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

Modified Files:
	RubyEditor.java 
Log Message:


Index: RubyEditor.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyEditor.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** RubyEditor.java	21 Apr 2006 21:13:29 -0000	1.44
--- RubyEditor.java	23 Apr 2006 19:58:23 -0000	1.45
***************
*** 109,112 ****
--- 109,114 ----
  	/** Preference key for automatically closing brackets and parenthesis */
  	private final static String CLOSE_BRACKETS= PreferenceConstants.EDITOR_CLOSE_BRACKETS;
+ 	/** Preference key for automatically closing braces */
+ 	private final static String CLOSE_BRACES= PreferenceConstants.EDITOR_CLOSE_BRACES;
      
      /**
***************
*** 255,260 ****
--- 257,264 ----
          	IPreferenceStore preferenceStore= getPreferenceStore();
      		boolean closeBrackets= preferenceStore.getBoolean(CLOSE_BRACKETS);
+     		boolean closeBraces= preferenceStore.getBoolean(CLOSE_BRACES);
      		boolean closeStrings= preferenceStore.getBoolean(CLOSE_STRINGS);
      		fBracketInserter.setCloseBracketsEnabled(closeBrackets);
+     		fBracketInserter.setCloseBracesEnabled(closeBraces);
      		fBracketInserter.setCloseStringsEnabled(closeStrings);
              ((ITextViewerExtension) sourceViewer).prependVerifyKeyListener(fBracketInserter);
***************
*** 662,665 ****
--- 666,674 ----
  			return;
  		}
+ 		
+ 		if (CLOSE_BRACES.equals(property)) {
+ 			fBracketInserter.setCloseBracesEnabled(getPreferenceStore().getBoolean(property));
+ 			return;
+ 		}
  
  		if (CLOSE_STRINGS.equals(property)) {
***************
*** 929,932 ****
--- 938,942 ----
          private boolean fCloseBrackets = true;
          private boolean fCloseStrings = true;
+         private boolean fCloseBraces = true;
          private final String CATEGORY = toString();
          private IPositionUpdater fUpdater = new ExclusivePositionUpdater(CATEGORY);
***************
*** 940,943 ****
--- 950,957 ----
              fCloseStrings = enabled;
          }
+         
+         public void setCloseBracesEnabled(boolean enabled) {
+             fCloseBraces = enabled;
+         }
  
          /*
***************
*** 989,993 ****
  
                  case '{':
!                     if (!fCloseBrackets || nextToken == Symbols.TokenLBRACE
                              || nextToken == Symbols.TokenIDENT || next != null && next.length() > 1)
                          return;
--- 1003,1007 ----
  
                  case '{':
!                     if (!fCloseBraces || nextToken == Symbols.TokenLBRACE
                              || nextToken == Symbols.TokenIDENT || next != null && next.length() > 1)
                          return;