rt

designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

@@ -145,7 +145,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 
 	@Override
 	protected String title4PopupWindow() {
-		return Inter.getLocText("DS-Database_Query");
+		return Inter.getLocText("FR-Designer-DS-Database_Query");
 	}
 
 	private void refresh() {
@@ -168,7 +168,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 		toolBarDef.addShortCut(new EditPageQueryAction());
 		toolBarDef.addShortCut(SeparatorDef.DEFAULT);
 		toolBarDef.addShortCut(new EditCustomCountQueryAction());
-		isShareCheckBox = new UICheckBox(Inter.getLocText("Is_Share_DBTableData"));
+		isShareCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Is_Share_DBTableData"));
 		maxPanel = new MaxMemRowCountPanel();
 		maxPanel.setBorder(null);
 		UIToolbar editToolBar = ToolBarDef.createJToolBar();
@@ -297,46 +297,46 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 		}
 	}
 
-	private class EditCustomCountQueryAction extends UpdateAction {
+	private class EditPageQueryAction extends UpdateAction {
-		public EditCustomCountQueryAction() {
+		public EditPageQueryAction() {
-			this.setName(Inter.getLocText("FR-Designer-LayerPageReport_CustomCountQuery"));
+			this.setName(Inter.getLocText("FR-Designer-LayerPageReport_PageQuery"));
+			this.setMnemonic('L');
 			this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/text.png"));
 		}
 
-		@Override
 		public void actionPerformed(ActionEvent e) {
-			final QueryPane editPane = new QueryPane(Inter.getLocText("FR-Designer-LayerPageReport_Define_CustomCountQuery"));
+			final QueryPane pane = new QueryPane(Inter.getLocText("FR-Designer-LayerPageReport_Define_PageQuerySQL"));
-			editPane.populate(customCountQuery);
+			pane.populate(pageQuery);
-			BasicDialog dialog = editPane.showWindow(DesignerContext.getDesignerFrame());
+			BasicDialog dialog = pane.showWindow(DesignerContext.getDesignerFrame());
 			dialog.addDialogActionListener(new DialogActionAdapter() {
 				public void doOk() {
-					customCountQuery = editPane.update();
+					pageQuery = pane.update();
 					checkParameter();
 				}
 			});
 			dialog.setVisible(true);
-
 		}
 	}
 
-	private class EditPageQueryAction extends UpdateAction {
+	private class EditCustomCountQueryAction extends UpdateAction {
-		public EditPageQueryAction() {
+		public EditCustomCountQueryAction() {
-			this.setName(Inter.getLocText("FR-Designer-LayerPageReport_PageQuery"));
+			this.setName(Inter.getLocText("FR-Designer-LayerPageReport_CustomCountQuery"));
-			this.setMnemonic('L');
 			this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/text.png"));
 		}
 
+		@Override
 		public void actionPerformed(ActionEvent e) {
-			final QueryPane pane = new QueryPane(Inter.getLocText("FR-Designer-LayerPageReport_Define_PageQuerySQL"));
+			final QueryPane editPane = new QueryPane(Inter.getLocText("FR-Designer-LayerPageReport_Define_CustomCountQuery"));
-			pane.populate(pageQuery);
+			editPane.populate(customCountQuery);
-			BasicDialog dialog = pane.showWindow(DesignerContext.getDesignerFrame());
+			BasicDialog dialog = editPane.showWindow(DesignerContext.getDesignerFrame());
 			dialog.addDialogActionListener(new DialogActionAdapter() {
 				public void doOk() {
-					pageQuery = pane.update();
+					customCountQuery = editPane.update();
 					checkParameter();
 				}
 			});
 			dialog.setVisible(true);
+
 		}
 	}