[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv/panel LDBMSettingsPanel.java, 1.1.1.1, 1.2

[Nathan Kinder (nkinder)]

Author: nkinder

Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17046/panel

Modified Files:
	LDBMSettingsPanel.java 
Log Message:
Resolves: 178247
Summary: Removed disabled cachesize field from Database Settings tab.



Index: LDBMSettingsPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/LDBMSettingsPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- LDBMSettingsPanel.java	18 Jul 2005 00:55:58 -0000	1.1.1.1
+++ LDBMSettingsPanel.java	17 Oct 2007 18:04:34 -0000	1.2
@@ -156,25 +156,7 @@
 		            roDSEntry);
 		setComponentTable(_cbIsReadOnly, roDSEntry);
 	
-
 		/* Cache info */
-		boolean enablecachesize = DSUtil.getBoolean(_section, "cachesize-enable");
-		_tfcachesize = makeNumericalJTextField( _section, "cachesize" );
-		_lcachesize = makeJLabel(_section, "cachesize");
-		_lcachesize.setLabelFor(_tfcachesize);
-		_tfcachesize.setEnabled(enablecachesize);
-		
-		JLabel lcachesizeUnit = makeJLabel(_section, "cachesize-unit");
-		lcachesizeUnit.setLabelFor(_tfcachesize);
-
-        DSEntryLong cachesizeDSEntry = new DSEntryLong(null, 
-            _tfcachesize, _lcachesize,
-            CACHE_SIZE_NUM_MIN_VAL, CACHE_SIZE_NUM_MAX_VAL, 1);
-        entries.add(_dnEntry, DB_CACHESIZE_ATTR_NAM,
-            cachesizeDSEntry);
-        setComponentTable(_tfcachesize, cachesizeDSEntry);
-
-
 		_tfcachememsize = makeNumericalJTextField( _section, "cachememsize" );
 		_lcachememsize = makeJLabel(_section, "cachememsize");
 		_lcachememsize.setLabelFor(_tfcachememsize);
@@ -230,22 +212,6 @@
 		gbc.gridx = 0;
 		gbc.fill = gbc.NONE;
 		gbc.anchor = gbc.EAST;
-		grid.add( _lcachesize, gbc);
-
-		gbc.gridx = 1;
-		gbc.anchor = gbc.CENTER;
-		gbc.fill = gbc.HORIZONTAL;
-		grid.add( _tfcachesize, gbc);
-		
-		gbc.gridx = 2;
-		gbc.fill = gbc.NONE;
-		gbc.anchor = gbc.WEST;
-		grid.add( lcachesizeUnit, gbc);
-		gbc.gridy++;
-
-		gbc.gridx = 0;
-		gbc.fill = gbc.NONE;
-		gbc.anchor = gbc.EAST;
 		grid.add( _lcachememsize, gbc);
 
 		gbc.gridx = 1;
@@ -301,16 +267,11 @@
 	private JLabel		_lSuffixText;
 	private JLabel		_lSuffixLabel;
 
-    private JTextField	_tfcachememsize;
-    private JLabel		_lcachememsize;
-    private JTextField	_tfcachesize;
-    private JLabel		_lcachesize;
+	private JTextField	_tfcachememsize;
+	private JLabel		_lcachememsize;
 
-	private static final long CACHE_SIZE_NUM_MIN_VAL = -1;
-	private static final long CACHE_SIZE_NUM_MAX_VAL = Long.MAX_VALUE;
 	private static final long CACHEMEM_SIZE_NUM_MIN_VAL = 200000;
-	private static final long CACHEMEM_SIZE_NUM_MAX_VAL = CACHE_SIZE_NUM_MAX_VAL;
-	private static final String DB_CACHESIZE_ATTR_NAM = "nsslapd-cachesize";
+	private static final long CACHEMEM_SIZE_NUM_MAX_VAL = Long.MAX_VALUE;
 	private static final String DB_CACHEMEMSIZE_ATTR_NAM = "nsslapd-cachememsize";
 
 	private static final String _section = "dbsettings";