git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@48 6a642e6f-84f6-412e-ac94-c4a38d5a04b0

.classpath

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="test"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/junit.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

.project

@@ -5,7 +5,13 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>

src/org/zlibrary/options/ZLBoolean3Option.java

@@ -1,9 +1,9 @@
-package org.zlibrary.options.impl;
+package org.zlibrary.options;
 
 import org.zlibrary.options.*;
 import org.zlibrary.options.util.*;
 
-public final class ZLBoolean3Option extends ZLSimpleOptionImpl{
+public final class ZLBoolean3Option extends ZLSimpleOption{
 	
 	private	ZLBoolean3 myValue;
 	private	ZLBoolean3 myDefaultValue;

src/org/zlibrary/options/ZLBooleanOption.java

@@ -1,8 +1,6 @@
-package org.zlibrary.options.impl;
+package org.zlibrary.options;
 
-import org.zlibrary.options.*;
-
-public final class ZLBooleanOption extends ZLSimpleOptionImpl{
+public final class ZLBooleanOption extends ZLSimpleOption{
 	
 	private boolean myValue;
 	private boolean myDefaultValue;

src/org/zlibrary/options/ZLColorOption.java

@@ -1,8 +1,8 @@
-package org.zlibrary.options.impl;
+package org.zlibrary.options;
 
 import org.zlibrary.options.util.*;
 
-public final class ZLColorOption extends ZLOptionImpl{
+public final class ZLColorOption extends ZLOption{
 	
 	private long myIntValue;
 	private long myDefaultIntValue;

src/org/zlibrary/options/ZLDoubleOption.java

@@ -1,6 +1,6 @@
-package org.zlibrary.options.impl;
+package org.zlibrary.options;
 
-public final class ZLDoubleOption extends ZLOptionImpl{
+public final class ZLDoubleOption extends ZLOption{
 	
 	private double myValue;
 	private double myDefaultValue;

src/org/zlibrary/options/ZLIntegerOption.java

@@ -1,6 +1,6 @@
-package org.zlibrary.options.impl;
+package org.zlibrary.options;
 
-public final class ZLIntegerOption extends ZLOptionImpl{
+public final class ZLIntegerOption extends ZLOption{
 	private long myValue;
 	private long myDefaultValue;
 	

src/org/zlibrary/options/ZLIntegerRangeOption.java

@@ -1,6 +1,6 @@
-package org.zlibrary.options.impl;
+package org.zlibrary.options;
 
-public final class ZLIntegerRangeOption extends ZLOptionImpl{
+public final class ZLIntegerRangeOption extends ZLOption{
 	private long myValue;
 	private long myDefaultValue;
 	private long myMinValue;

src/org/zlibrary/options/ZLOption.java

@@ -1,11 +1,24 @@
 package org.zlibrary.options;
 
-public interface ZLOption {
+public abstract class ZLOption {
 	public static final String LOOK_AND_FEEL_CATEGORY = "UI";
 	public static final String CONFIG_CATEGORY = "options";
 	public static final String STATE_CATEGORY = "state";
 	
-	public void clearGroup(String group);
+	public String myCategory;
+	public String myGroup;
+	public String myOptionName;
+	public boolean myIsSynchronized;
+
+	public void clearGroup(String group){
+		
+	}
+	
+	//private final ZLOption& operator = (final ZLOptions options);
+	
+	public ZLOption (String category, String group, String optionName){
+		
+	}
 	//public boolean isAutoSavingSupported();
     //public void startAutoSave(int seconds);
 		

src/org/zlibrary/options/ZLSimpleOption.java

@@ -1,8 +0,0 @@
-package org.zlibrary.options;
-
-
-public interface ZLSimpleOption extends ZLOption{
-
-	public OptionType getType();
-
-}

src/org/zlibrary/options/ZLSimpleOptionImpl.java

@@ -0,0 +1,17 @@
+package org.zlibrary.options;
+
+
+abstract class ZLSimpleOption extends ZLOption {
+
+	public abstract OptionType getType();
+
+	public ZLSimpleOption(String category, String group, String optionName){
+		super(category, group, optionName);
+	}
+
+	/*public void clearGroup(String group) {
+		// TODO Auto-generated method stub
+
+	}*/
+
+}

src/org/zlibrary/options/ZLStringOption.java

@@ -1,8 +1,7 @@
-package org.zlibrary.options.impl;
+package org.zlibrary.options;
 
-import org.zlibrary.options.OptionType;
 
-public final class ZLStringOption extends ZLSimpleOptionImpl {
+public final class ZLStringOption extends ZLSimpleOption {
 	
 	
 	private String myValue;

src/org/zlibrary/options/impl/ZLOptionImpl.java

@@ -1,21 +0,0 @@
-package org.zlibrary.options.impl;
-
-import org.zlibrary.options.*;
-
-abstract class ZLOptionImpl implements ZLOption{
-	
-	public String myCategory;
-	public String myGroup;
-	public String myOptionName;
-	public boolean myIsSynchronized;
-
-	public void clearGroup(String group){
-		
-	}
-	
-	//private final ZLOption& operator = (final ZLOptions options);
-	
-	public ZLOptionImpl (String category, String group, String optionName){
-		
-	}
-}

src/org/zlibrary/options/impl/ZLSimpleOptionImpl.java

@@ -1,19 +0,0 @@
-package org.zlibrary.options.impl;
-
-import org.zlibrary.options.OptionType;
-import org.zlibrary.options.ZLSimpleOption;
-
-abstract class ZLSimpleOptionImpl extends ZLOptionImpl implements ZLSimpleOption {
-
-	public abstract OptionType getType();
-
-	public ZLSimpleOptionImpl(String category, String group, String optionName){
-		super(category, group, optionName);
-	}
-
-	/*public void clearGroup(String group) {
-		// TODO Auto-generated method stub
-
-	}*/
-
-}

src/org/zlibrary/options/util/ZLColor.java

@@ -1,14 +1,12 @@
 package org.zlibrary.options.util;
 
-import org.zlibrary.options.util.exceptions.*;
-
 import java.awt.Color;
 
 public class ZLColor {
 	
-	private byte myRed;
-	private byte myGreen;
-	private byte myBlue;
+	private int myRed;
+	private int myGreen;
+	private int myBlue;
 	
 	public int getBlue() {
 		return myBlue;
@@ -20,15 +18,15 @@ public class ZLColor {
 		return myRed;
 	}
 
-	public void setBlue(byte mask) throws InvalidValueException{
+	public void setBlue(int mask){
 		setColor(myRed, myGreen, mask);
 	}
     
-	public void setGreen(byte mask) throws InvalidValueException{
+	public void setGreen(int mask){
     	setColor(myRed, mask, myBlue);
 	}
     
-	public void setRed(byte mask) throws InvalidValueException{
+	public void setRed(int mask){
 		setColor(mask, myGreen, myBlue);
 	}
 	
@@ -67,28 +65,15 @@ public class ZLColor {
 	 * @param green
 	 * @param blue
 	 */
-	public void setColor (byte red, byte green, byte blue) throws InvalidValueException{
-		if (! ((red >= -1) && (red < 256)) ){
-			throw new InvalidValueException
-					  (" Red Mask Value must stay between 0 and 255");
-		}
-		if (! ((green >= 0) && (green < 256)) ){
-			throw new InvalidValueException
-					  (" Green Mask Value must stay between 0 and 255");
-		}
-		if (! ((blue >= 0) && (blue < 256)) ){
-			throw new InvalidValueException
-					  (" Blue Mask Value must stay between 0 and 255");
-		}
+	public void setColor (int red, int green, int blue){
 		myRed = red;
 		myGreen = green;
 		myBlue = blue;
-		
 	}
 	/**
 	 * êîíñòðóêòîð ñ ïàðàìåòðàìè
 	 */
-	public ZLColor (byte red, byte green, byte blue) throws InvalidValueException{
+	public ZLColor (int red, int green, int blue){
 		setColor(red, green, blue);
 	}
 	
@@ -99,9 +84,9 @@ public class ZLColor {
 	 * @param color
 	 */
 	public void convertFromColor(Color color){
-		myRed = (byte)color.getRed();
-		myGreen = (byte)color.getGreen();
-		myBlue = (byte)color.getBlue();
+		myRed = (int)color.getRed();
+		myGreen = (int)color.getGreen();
+		myBlue = (int)color.getBlue();
 	}
 	
 	/**
@@ -109,8 +94,8 @@ public class ZLColor {
 	 * @param color
 	 * @throws InvalidValueException
 	 */
-	public ZLColor (Color color) throws InvalidValueException{
-		setColor((byte)color.getRed(), (byte)color.getGreen(), (byte)color.getBlue());
+	public ZLColor (Color color){
+		setColor((int)color.getRed(), (int)color.getGreen(), (int)color.getBlue());
 	}
 	
 	/**

src/org/zlibrary/options/util/exceptions/InvalidValueException.java

@@ -1,13 +0,0 @@
-package org.zlibrary.options.util.exceptions;
-
-public class InvalidValueException extends Exception {
-	static final long serialVersionUID = 0;
-	
-	/**
-	 * êîíñòðóêòîð äëÿ îøèáêè êîäà
-	 * @param s
-	 */
-	public InvalidValueException (String s){
-		super("Invelid Value Exception - " + s);
-	}
-}