--- a/dwt/internal/cocoa/NSParagraphStyle.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/internal/cocoa/NSParagraphStyle.d	Mon Dec 01 17:07:00 2008 +0100
@@ -1,28 +1,27 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *     
  * Port to the D programming language:
- *     Jacob Carlborg <jacob.carlborg@gmail.com>
+ *    Jacob Carlborg <doob@me.com>
  *******************************************************************************/
 module dwt.internal.cocoa.NSParagraphStyle;
 
-import dwt.internal.cocoa.CGFloat;
+import dwt.dwthelper.utils;
+import cocoa = dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSArray;
-import dwt.internal.cocoa.NSInteger;
 import dwt.internal.cocoa.NSObject;
-import dwt.internal.cocoa.NSString;
-import dwt.internal.cocoa.NSText : NSTextAlignment, NSWritingDirection;
+import dwt.internal.cocoa.NSText;
 import dwt.internal.cocoa.OS;
 import objc = dwt.internal.objc.runtime;
 
-enum NSLineBreakMode : NSUInteger
+enum NSLineBreakMode 
 {
     NSLineBreakByWordWrapping = 0,
     NSLineBreakByCharWrapping,
@@ -32,134 +31,35 @@
     NSLineBreakByTruncatingMiddle
 }
 
-alias NSLineBreakMode.NSLineBreakByWordWrapping NSLineBreakByWordWrapping;
-alias NSLineBreakMode.NSLineBreakByCharWrapping NSLineBreakByCharWrapping;
-alias NSLineBreakMode.NSLineBreakByClipping NSLineBreakByClipping;
-alias NSLineBreakMode.NSLineBreakByTruncatingHead NSLineBreakByTruncatingHead;
-alias NSLineBreakMode.NSLineBreakByTruncatingTail NSLineBreakByTruncatingTail;
-alias NSLineBreakMode.NSLineBreakByTruncatingMiddle NSLineBreakByTruncatingMiddle;
-
-public class NSParagraphStyle : NSObject
+enum NSTextTabType
 {
-
-    public this ()
-    {
-        super();
-    }
-
-    public this (objc.id id)
-    {
-        super(id);
-    }
-
-    public NSTextAlignment alignment ()
-    {
-        return cast(NSTextAlignment) OS.objc_msgSend(this.id_, OS.sel_alignment);
-    }
-
-    public NSWritingDirection baseWritingDirection ()
-    {
-        return cast(NSWritingDirection) OS.objc_msgSend(this.id_, OS.sel_baseWritingDirection);
-    }
+    NSLeftTabStopType = 0,
+    NSRightTabStopType,
+    NSCenterTabStopType,
+    NSDecimalTabStopType
+}
 
-    public static NSParagraphStyle defaultParagraphStyle ()
-    {
-        objc.id result = OS.objc_msgSend(OS.class_NSParagraphStyle, OS.sel_defaultParagraphStyle);
-        return result !is null ? new NSParagraphStyle(result) : null;
-    }
-
-    public CGFloat defaultTabInterval ()
-    {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_defaultTabInterval);
-    }
+public class NSParagraphStyle : NSObject {
 
-    public static NSWritingDirection defaultWritingDirectionForLanguage (NSString languageName)
-    {
-        return cast(NSWritingDirection) OS.objc_msgSend(OS.class_NSParagraphStyle, OS.sel_defaultWritingDirectionForLanguage_1,
-                languageName !is null ? languageName.id_ : null);
-    }
-
-    public CGFloat firstLineHeadIndent ()
-    {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_firstLineHeadIndent);
-    }
-
-    public CGFloat headIndent ()
-    {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_headIndent);
-    }
-
-    public NSInteger headerLevel ()
-    {
-        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_headerLevel);
-    }
+public this() {
+    super();
+}
 
-    public float hyphenationFactor ()
-    {
-        return cast(float) OS.objc_msgSend_fpret(this.id_, OS.sel_hyphenationFactor);
-    }
-
-    public NSLineBreakMode lineBreakMode ()
-    {
-        return cast(NSLineBreakMode) OS.objc_msgSend(this.id_, OS.sel_lineBreakMode);
-    }
-
-    public CGFloat lineHeightMultiple ()
-    {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_lineHeightMultiple);
-    }
+public this(objc.id id) {
+    super(id);
+}
 
-    public CGFloat lineSpacing ()
-    {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_lineSpacing);
-    }
-
-    public CGFloat maximumLineHeight ()
-    {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_maximumLineHeight);
-    }
-
-    public CGFloat minimumLineHeight ()
-    {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_minimumLineHeight);
-    }
+public this(cocoa.id id) {
+    super(id);
+}
 
-    public CGFloat paragraphSpacing ()
-    {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_paragraphSpacing);
-    }
-
-    public CGFloat paragraphSpacingBefore ()
-    {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_paragraphSpacingBefore);
-    }
-
-    public NSArray tabStops ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_tabStops);
-        return result !is null ? new NSArray(result) : null;
-    }
+public NSTextAlignment alignment() {
+    return cast(NSTextAlignment) OS.objc_msgSend(this.id, OS.sel_alignment);
+}
 
-    public CGFloat tailIndent ()
-    {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_tailIndent);
-    }
-
-    public NSArray textBlocks ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_textBlocks);
-        return result !is null ? new NSArray(result) : null;
-    }
-
-    public NSArray textLists ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_textLists);
-        return result !is null ? new NSArray(result) : null;
-    }
-
-    public float tighteningFactorForTruncation ()
-    {
-        return cast(float) OS.objc_msgSend_fpret(this.id_, OS.sel_tighteningFactorForTruncation);
-    }
+public NSArray tabStops() {
+    objc.id result = OS.objc_msgSend(this.id, OS.sel_tabStops);
+    return result !is null ? new NSArray(result) : null;
+}
 
 }