diff dwtx/jface/text/TextUtilities.d @ 136:6dcb0baaa031

Regex removal of throws decls, some instanceof
author Frank Benoit <benoit@tionex.de>
date Sun, 24 Aug 2008 02:20:40 +0200
parents 51e6e63f930e
children 75302ef3f92f
line wrap: on
line diff
--- a/dwtx/jface/text/TextUtilities.d	Sun Aug 24 01:52:31 2008 +0200
+++ b/dwtx/jface/text/TextUtilities.d	Sun Aug 24 02:20:40 2008 +0200
@@ -180,7 +180,7 @@
     /**
      * Default line delimiters used by the text functions of this class.
      */
-    public final static String[] DELIMITERS= new String[] { "\n", "\r", "\r\n" }; //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
+    public final static String[] DELIMITERS= [ "\n", "\r", "\r\n" ]; //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
 
     /**
      * Default line delimiters used by these text functions.
@@ -327,7 +327,7 @@
      * @return returns the merged document event
      * @throws BadLocationException might be thrown if document is not in the correct state with respect to document events
      */
-    public static DocumentEvent mergeUnprocessedDocumentEvents(IDocument unprocessedDocument, List documentEvents) throws BadLocationException {
+    public static DocumentEvent mergeUnprocessedDocumentEvents(IDocument unprocessedDocument, List documentEvents)  {
 
         if (documentEvents.size() is 0)
             return null;
@@ -392,7 +392,7 @@
      * @return returns the merged document event
      * @throws BadLocationException might be thrown if document is not in the correct state with respect to document events
      */
-    public static DocumentEvent mergeProcessedDocumentEvents(List documentEvents) throws BadLocationException {
+    public static DocumentEvent mergeProcessedDocumentEvents(List documentEvents)  {
 
         if (documentEvents.size() is 0)
             return null;
@@ -452,7 +452,7 @@
      */
     public static Map removeDocumentPartitioners(IDocument document) {
         Map partitioners= new HashMap();
-        if (document instanceof IDocumentExtension3) {
+        if (cast(IDocumentExtension3)document ) {
             IDocumentExtension3 extension3= cast(IDocumentExtension3) document;
             String[] partitionings= extension3.getPartitionings();
             for (int i= 0; i < partitionings.length; i++) {
@@ -483,7 +483,7 @@
      * @since 3.0
      */
     public static void addDocumentPartitioners(IDocument document, Map partitioners) {
-        if (document instanceof IDocumentExtension3) {
+        if (cast(IDocumentExtension3)document ) {
             IDocumentExtension3 extension3= cast(IDocumentExtension3) document;
             Iterator e= partitioners.keySet().iterator();
             while (e.hasNext()) {
@@ -513,8 +513,8 @@
      * @throws BadLocationException if offset is invalid in the document
      * @since 3.0
      */
-    public static String getContentType(IDocument document, String partitioning, int offset, bool preferOpenPartitions) throws BadLocationException {
-        if (document instanceof IDocumentExtension3) {
+    public static String getContentType(IDocument document, String partitioning, int offset, bool preferOpenPartitions)  {
+        if (cast(IDocumentExtension3)document ) {
             IDocumentExtension3 extension3= cast(IDocumentExtension3) document;
             try {
                 return extension3.getContentType(partitioning, offset, preferOpenPartitions);
@@ -540,8 +540,8 @@
      * @throws BadLocationException if offset is invalid in the given document
      * @since 3.0
      */
-    public static ITypedRegion getPartition(IDocument document, String partitioning, int offset, bool preferOpenPartitions) throws BadLocationException {
-        if (document instanceof IDocumentExtension3) {
+    public static ITypedRegion getPartition(IDocument document, String partitioning, int offset, bool preferOpenPartitions)  {
+        if (cast(IDocumentExtension3)document ) {
             IDocumentExtension3 extension3= cast(IDocumentExtension3) document;
             try {
                 return extension3.getPartition(partitioning, offset, preferOpenPartitions);
@@ -568,8 +568,8 @@
      *         document
      * @since 3.0
      */
-    public static ITypedRegion[] computePartitioning(IDocument document, String partitioning, int offset, int length, bool includeZeroLengthPartitions) throws BadLocationException {
-        if (document instanceof IDocumentExtension3) {
+    public static ITypedRegion[] computePartitioning(IDocument document, String partitioning, int offset, int length, bool includeZeroLengthPartitions)  {
+        if (cast(IDocumentExtension3)document ) {
             IDocumentExtension3 extension3= cast(IDocumentExtension3) document;
             try {
                 return extension3.computePartitioning(partitioning, offset, length, includeZeroLengthPartitions);
@@ -590,14 +590,14 @@
      * @since 3.0
      */
     public static String[] computePartitionManagingCategories(IDocument document) {
-        if (document instanceof IDocumentExtension3) {
+        if (cast(IDocumentExtension3)document ) {
             IDocumentExtension3 extension3= cast(IDocumentExtension3) document;
             String[] partitionings= extension3.getPartitionings();
             if (partitionings !is null) {
                 Set categories= new HashSet();
                 for (int i= 0; i < partitionings.length; i++) {
                     IDocumentPartitioner p= extension3.getDocumentPartitioner(partitionings[i]);
-                    if (p instanceof IDocumentPartitionerExtension2) {
+                    if (cast(IDocumentPartitionerExtension2)p ) {
                         IDocumentPartitionerExtension2 extension2= cast(IDocumentPartitionerExtension2) p;
                         String[] c= extension2.getManagingPositionCategories();
                         if (c !is null) {
@@ -625,11 +625,11 @@
      */
     public static String getDefaultLineDelimiter(IDocument document) {
 
-        if (document instanceof IDocumentExtension4) 
+        if (cast(IDocumentExtension4)document )
             return (cast(IDocumentExtension4)document).getDefaultLineDelimiter();
-        
+
         String lineDelimiter= null;
-            
+
         try {
             lineDelimiter= document.getLineDelimiter(0);
         } catch (BadLocationException x) {
@@ -637,7 +637,7 @@
 
         if (lineDelimiter !is null)
             return lineDelimiter;
-        
+
         String sysLineDelimiter= System.getProperty("line.separator"); //$NON-NLS-1$
         String[] delimiters= document.getLegalLineDelimiters();
         Assert.isTrue(delimiters.length > 0);
@@ -647,7 +647,7 @@
                 break;
             }
         }
-        
+
         if (lineDelimiter is null)
             lineDelimiter= delimiters[0];