Refactoring

Author: gerdwagner

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/BinaryDisplayConverter.java

@@ -103,45 +103,60 @@ public static String convertToString(Byte[] data, int base, boolean showAscii) {
 		ConversionConstants convConst = getConstants(base);
 
 		// Convert each byte and put into string buffer
-		for (int i=0; i < data.length; i++) {
+		for(int i = 0; i < data.length; i++)
+		{
 			int value = data[i].byteValue();
 			String s = null;
-			
+
 			// if user wants to see ASCII chars as characters,
 			// see if this is one that should be displayed that way
-			if (showAscii) {
-				if (printable.indexOf((char)value) > -1) {
-					s = Character.valueOf((char)value) +
-						"          ".substring(10-(convConst.width - 1));
+			if(showAscii)
+			{
+				if(printable.indexOf((char) value) > -1)
+				{
+					s = Character.valueOf((char) value) + "          ".substring(10 - (convConst.width - 1));
 				}
 			}
-			
+
 			// if use is not looking for ASCII chars, or if this one is one that
 			// is not printable, then convert it into numeric form
-			if (s == null) {
-				switch (base) {
-					case DECIMAL:	
+			if(s == null)
+			{
+				switch(base)
+				{
+					case DECIMAL:
 						// convert signed to unsigned
-						if (value < 0)
+						if(value < 0)
+						{
 							value = 256 + value;
-						s = Integer.toString(value); break;
-					case OCTAL:		s = Integer.toOctalString(value); break;
-					case BINARY:	s = Integer.toBinaryString(value); break;
-					case HEX:	// fall through to default
+						}
+						s = Integer.toString(value);
+						break;
+					case OCTAL:
+						s = Integer.toOctalString(value);
+						break;
+					case BINARY:
+						s = Integer.toBinaryString(value);
+						break;
+					case HEX:   // fall through to default
 					default:
 						s = Integer.toHexString(value);
 				}
 				// some formats (e.g. hex & octal) extend a negative number to multiple places
 				// (e.g. FC becomes FFFC), so chop off extra stuff in front
-				if (s.length() > convConst.width)
+				if(s.length() > convConst.width)
+				{
 					s = s.substring(s.length() - convConst.width);
-			
+				}
+
 				// front pad with zeros and add to output
-				if (s.length() < convConst.width)
-					buf.append("00000000".substring(8-(convConst.width - s.length())));
+				if(s.length() < convConst.width)
+				{
+					buf.append("00000000".substring(8 - (convConst.width - s.length())));
+				}
 			}
 			buf.append(s);
-			buf.append("  ");	// always add spaces at end for consistancy
+			buf.append("  ");   // always add spaces at end for consistancy
 		}
 		return buf.toString();
 	}

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/celldatapopup/PopupEditableIOPanel.java

@@ -227,20 +227,18 @@ public PopupEditableIOPanel(ColumnDisplayDefinition colDef, Object value, boolea
 			radixList.addActionListener(optionActionListener);
 			previousRadixListItem = "Hex";
 
-			showAscii = new JCheckBox();
+			showAscii = new JCheckBox(s_stringMgr.getString("popupeditableIoPanel.showAscii"));
 			previousShowAscii = false;
 			showAscii.addActionListener(optionActionListener);
 
 			JPanel displayControlsPanel = new JPanel();
 			// use default sequential layout
 
-			// i18n[popupeditableIoPanel.numberBase=Number Base:]
 			displayControlsPanel.add(new JLabel(s_stringMgr.getString("popupeditableIoPanel.numberBase")));
 			displayControlsPanel.add(radixList);
 			displayControlsPanel.add(new JLabel("    "));	// add some space
 			displayControlsPanel.add(showAscii);
-			// i18n[popupeditableIoPanel.showAscii=Show ASCII as chars]
-			displayControlsPanel.add(new JLabel(s_stringMgr.getString("popupeditableIoPanel.showAscii")));
+			//displayControlsPanel.add(new JLabel(s_stringMgr.getString("popupeditableIoPanel.showAscii")));
 			displayPanel.add(displayControlsPanel, BorderLayout.SOUTH);
 		}
 		add(displayPanel, BorderLayout.CENTER);