[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om NavigationItem.java Page.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om
In directory 
james.mmbase.org:/tmp/cvs-serv14324/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om

Modified Files:
        NavigationItem.java Page.java 
Log Message:
CMSC-682 Move secure and inmenu fields to navigationitem


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om
See also: http://www.mmbase.org/jira/browse/CMSC-682


Index: NavigationItem.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om/NavigationItem.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NavigationItem.java 7 Jan 2008 20:27:17 -0000       1.4
+++ NavigationItem.java 16 Jan 2008 10:56:09 -0000      1.5
@@ -16,6 +16,8 @@
    private Date expirydate;
    private boolean use_expiry;
    private String lastmodifier;
+   private boolean inmenu;
+   private boolean secure;
 
 
    public int compareTo(NavigationItem o) {
@@ -111,4 +113,20 @@
    public void setLastmodifier(String lastmodifier) {
       this.lastmodifier = lastmodifier;
    }
+
+    public boolean isInmenu() {
+        return inmenu;
+    }
+
+    public void setInmenu(boolean inmenu) {
+        this.inmenu = inmenu;
+    }
+
+    public boolean isSecure() {
+        return secure;
+    }
+
+    public void setSecure(boolean secure) {
+        this.secure = secure;
+    }
 }


Index: Page.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om/Page.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- Page.java   3 Dec 2007 13:10:26 -0000       1.8
+++ Page.java   16 Jan 2008 10:56:09 -0000      1.9
@@ -17,8 +17,6 @@
 @SuppressWarnings("serial")
 public class Page extends NavigationItem {
 
-   private boolean inmenu;
-   private boolean secure;
    private String externalurl;
 
    private Map<String, Integer> portlets = new HashMap<String, Integer>();
@@ -27,21 +25,6 @@
    private Map<String,List<Integer>> pageImages = new 
HashMap<String,List<Integer>>();
 
 
-   public boolean isInmenu() {
-      return inmenu;
-   }
-
-
-   public boolean getInmenu() {
-      return inmenu;
-   }
-
-
-   public void setInmenu(boolean inmenu) {
-      this.inmenu = inmenu;
-   }
-
-
    public int getLayout() {
       return layout;
    }
@@ -106,16 +89,6 @@
    }
 
 
-   public boolean isSecure() {
-      return secure;
-   }
-
-
-   public void setSecure(boolean secure) {
-      this.secure = secure;
-   }
-
-
    public String getExternalurl() {
       return externalurl;
    }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs