[jetrix-cvs] SF.net SVN: jetrix:[832] jetrix/trunk/src/java/net/jetrix/config

[<sm...@us...>]

Revision: 832
          http://jetrix.svn.sourceforge.net/jetrix/?rev=832&view=rev
Author:   smanux
Date:     2010-03-07 00:23:41 +0000 (Sun, 07 Mar 2010)

Log Message:
-----------
Persistence of the channel's sudden death settings

Modified Paths:
--------------
    jetrix/trunk/src/java/net/jetrix/config/ServerConfig.java
    jetrix/trunk/src/java/net/jetrix/config/Settings.java

Modified: jetrix/trunk/src/java/net/jetrix/config/ServerConfig.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/config/ServerConfig.java	2010-03-06 21:42:15 UTC (rev 831)
+++ jetrix/trunk/src/java/net/jetrix/config/ServerConfig.java	2010-03-07 00:23:41 UTC (rev 832)
@@ -605,12 +605,33 @@
                         }
                         out.println("        </special-occurancy>");
                     }
-
-                    // todo sudden death settings
                     
+                    // sudden death settings
+                    if (!settings.isDefaultSuddenDeath())
+                    {
+                        out.println("        <sudden-death>");
+                        if (!settings.isDefaultSuddenDeathTime())
+                        {
+                            out.println("          <time>" + settings.getSuddenDeathTime() + "</time>");
+                        }
+                        if (!settings.isDefaultSuddenDeathMessage())
+                        {
+                            out.println("          <message>" + settings.getSuddenDeathMessage() + "</message>");
+                        }
+                        if (!settings.isDefaultSuddenDeathDelay())
+                        {
+                            out.println("          <delay>" + settings.getSuddenDeathDelay() + "</delay>");
+                        }
+                        if (!settings.isDefaultSuddenDeathLinesAdded())
+                        {
+                            out.println("          <lines-added>" + settings.getSuddenDeathLinesAdded() + "</lines-added>");
+                        }
+                        out.println("        </sudden-death>");
+                    }
+                    
                     out.println("      </settings>");
                 }
-                 
+                
                 // local filters
                 Collection<MessageFilter> filters = channel.getLocalFilters();
                 if (!filters.isEmpty())

Modified: jetrix/trunk/src/java/net/jetrix/config/Settings.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/config/Settings.java	2010-03-06 21:42:15 UTC (rev 831)
+++ jetrix/trunk/src/java/net/jetrix/config/Settings.java	2010-03-07 00:23:41 UTC (rev 832)
@@ -19,9 +19,6 @@
 
 package net.jetrix.config;
 
-import static net.jetrix.config.Block.*;
-import static net.jetrix.config.Special.*;
-
 import java.util.*;
 
 /**
@@ -432,12 +429,17 @@
         normalize(specialOccurancy);
     }
 
+    private boolean isDefault()
+    {
+        return defaultSettings == null || this == defaultSettings;
+    }
+
     /**
      * Tells if the block occurancies of the default settings are used.
      */
     public boolean isDefaultBlockOccurancy()
     {
-        return defaultBlockOccurancy && defaultSettings != null && this != defaultSettings;
+        return defaultBlockOccurancy && !isDefault();
     }
 
     public void setDefaultBlockOccurancy(boolean defaultBlockOccurancy)
@@ -450,7 +452,7 @@
      */
     public boolean isDefaultSpecialOccurancy()
     {
-        return defaultSpecialOccurancy && defaultSettings != null && this != defaultSettings;
+        return defaultSpecialOccurancy && !isDefault();
     }
 
     public void setDefaultSpecialOccurancy(boolean defaultSpecialOccurancy)
@@ -460,7 +462,7 @@
 
     public boolean isDefaultStartingLevel()
     {
-        return defaultStartingLevel && defaultSettings != null && this != defaultSettings;
+        return defaultStartingLevel && !isDefault();
     }
 
     public void setDefaultStartingLevel(boolean defaultStartingLevel)
@@ -470,7 +472,7 @@
 
     public boolean isDefaultStackHeight()
     {
-        return defaultStackHeight && defaultSettings != null && this != defaultSettings;
+        return defaultStackHeight && !isDefault();
     }
 
     public void setDefaultStackHeight(boolean defaultStackHeight)
@@ -480,7 +482,7 @@
 
     public boolean isDefaultLinesPerLevel()
     {
-        return defaultLinesPerLevel && defaultSettings != null && this != defaultSettings;
+        return defaultLinesPerLevel && !isDefault();
     }
 
     public void setDefaultLinesPerLevel(boolean defaultLinesPerLevel)
@@ -490,7 +492,7 @@
 
     public boolean isDefaultLinesPerSpecial()
     {
-        return defaultLinesPerSpecial && defaultSettings != null && this != defaultSettings;
+        return defaultLinesPerSpecial && !isDefault();
     }
 
     public void setDefaultLinesPerSpecial(boolean defaultLinesPerSpecial)
@@ -500,7 +502,7 @@
 
     public boolean isDefaultLevelIncrease()
     {
-        return defaultLevelIncrease && defaultSettings != null && this != defaultSettings;
+        return defaultLevelIncrease && !isDefault();
     }
 
     public void setDefaultLevelIncrease(boolean defaultLevelIncrease)
@@ -510,7 +512,7 @@
 
     public boolean isDefaultSpecialAdded()
     {
-        return defaultSpecialAdded && defaultSettings != null && this != defaultSettings;
+        return defaultSpecialAdded && !isDefault();
     }
 
     public void setDefaultSpecialAdded(boolean defaultSpecialAdded)
@@ -520,7 +522,7 @@
 
     public boolean isDefaultSpecialCapacity()
     {
-        return defaultSpecialCapacity && defaultSettings != null && this != defaultSettings;
+        return defaultSpecialCapacity && !isDefault();
     }
 
     public void setDefaultSpecialCapacity(boolean defaultSpecialCapacity)
@@ -530,7 +532,7 @@
 
     public boolean isDefaultAverageLevels()
     {
-        return defaultAverageLevels && defaultSettings != null && this != defaultSettings;
+        return defaultAverageLevels && !isDefault();
     }
 
     public void setDefaultAverageLevels(boolean defaultAverageLevels)
@@ -540,7 +542,7 @@
 
     public boolean isDefaultClassicRules()
     {
-        return defaultClassicRules && defaultSettings != null && this != defaultSettings;
+        return defaultClassicRules && !isDefault();
     }
 
     public void setDefaultClassicRules(boolean defaultClassicRules)
@@ -550,7 +552,7 @@
 
     public boolean isDefaultSameBlocks()
     {
-        return defaultSameBlocks && defaultSettings != null && this != defaultSettings;
+        return defaultSameBlocks && !isDefault();
     }
 
     public void setDefaultSameBlocks(boolean defaultSameBlocks)
@@ -560,7 +562,7 @@
 
     public boolean isDefaultSuddenDeathTime()
     {
-        return defaultSuddenDeathTime && defaultSettings != null && this != defaultSettings;
+        return defaultSuddenDeathTime && !isDefault();
     }
 
     public void setDefaultSuddenDeathTime(boolean defaultSuddenDeathTime)
@@ -570,7 +572,7 @@
 
     public boolean isDefaultSuddenDeathMessage()
     {
-        return defaultSuddenDeathMessage && defaultSettings != null && this != defaultSettings;
+        return defaultSuddenDeathMessage && !isDefault();
     }
 
     public void setDefaultSuddenDeathMessage(boolean defaultSuddenDeathMessage)
@@ -580,7 +582,7 @@
 
     public boolean isDefaultSuddenDeathLinesAdded()
     {
-        return defaultSuddenDeathLinesAdded && defaultSettings != null && this != defaultSettings;
+        return defaultSuddenDeathLinesAdded && !isDefault();
     }
 
     public void setDefaultSuddenDeathLinesAdded(boolean defaultSuddenDeathLinesAdded)
@@ -590,7 +592,7 @@
 
     public boolean isDefaultSuddenDeathDelay()
     {
-        return defaultSuddenDeathDelay && defaultSettings != null && this != defaultSettings;
+        return defaultSuddenDeathDelay && !isDefault();
     }
 
     public void setDefaultSuddenDeathDelay(boolean defaultSuddenDeathDelay)
@@ -598,4 +600,11 @@
         this.defaultSuddenDeathDelay = defaultSuddenDeathDelay;
     }
 
+    public boolean isDefaultSuddenDeath()
+    {
+        return isDefaultSuddenDeathDelay()
+                && isDefaultSuddenDeathLinesAdded()
+                && isDefaultSuddenDeathMessage()
+                && isDefaultSuddenDeathTime();
+    }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.