svnno****@sourc*****
svnno****@sourc*****
2009年 3月 17日 (火) 03:40:07 JST
Revision: 2890
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2890
Author: daisuke_m
Date: 2009-03-17 03:40:06 +0900 (Tue, 17 Mar 2009)
Log Message:
-----------
リネームの影響を反映。
Modified Paths:
--------------
vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogIndexTab.java
-------------- next part --------------
Modified: vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogIndexTab.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogIndexTab.java 2009-03-16 18:38:40 UTC (rev 2889)
+++ vesta/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogIndexTab.java 2009-03-16 18:40:06 UTC (rev 2890)
@@ -64,7 +64,7 @@
import org.jiemamy.model.entity.TableModel;
import org.jiemamy.model.index.IndexColumnModel;
import org.jiemamy.model.index.IndexModel;
-import org.jiemamy.model.index.IndexColumnModel.SortType;
+import org.jiemamy.model.index.IndexColumnModel.SortOrder;
import org.jiemamy.utils.LogMarker;
import org.jiemamy.utils.model.JiemamyPropertyUtil;
import org.jiemamy.utils.model.TableUtil;
@@ -203,7 +203,7 @@
case 0:
return indexColumnModel.toString(); // TODO
case 1:
- return indexColumnModel.getSortType().toString(); // TODO ?
+ return indexColumnModel.getSortOrder().toString(); // TODO ?
default:
return "";
@@ -257,7 +257,7 @@
IndexModel indexModel = tableModel.getIndexes().get(indexIndex);
jiemamyFacade.addIndexColumn(indexModel, indexColumnModel);
- int addedIndex = tableModel.getIndexes().get(indexIndex).getColumns().indexOf(indexColumnModel);
+ int addedIndex = tableModel.getIndexes().get(indexIndex).getIndexColumns().indexOf(indexColumnModel);
table.setSelection(addedIndex);
enableEditControls(addedIndex);
@@ -368,7 +368,7 @@
int indexIndex = indexesTableEditor.getTableViewer().getTable().getSelectionIndex();
IndexModel indexModel = tableModel.getIndexes().get(indexIndex);
- IndexColumnModel indexColumnModel = indexModel.getColumns().get(index);
+ IndexColumnModel indexColumnModel = indexModel.getIndexColumns().get(index);
radSortNone.setEnabled(true);
radSortAsc.setEnabled(true);
@@ -377,9 +377,9 @@
radSortNone.setSelection(false);
radSortAsc.setSelection(false);
radSortDesc.setSelection(false);
- if (indexColumnModel.getSortType().equals(SortType.ASC)) {
+ if (indexColumnModel.getSortOrder().equals(SortOrder.ASC)) {
radSortAsc.setSelection(true);
- } else if (indexColumnModel.getSortType().equals(SortType.DESC)) {
+ } else if (indexColumnModel.getSortOrder().equals(SortOrder.DESC)) {
radSortDesc.setSelection(true);
} else {
radSortNone.setSelection(true);
@@ -408,7 +408,7 @@
jiemamyFacade.addIndexColumn(indexModel, index, indexColumnModel);
}
- int addedIndex = tableModel.getIndexes().get(indexIndex).getColumns().indexOf(indexColumnModel);
+ int addedIndex = tableModel.getIndexes().get(indexIndex).getIndexColumns().indexOf(indexColumnModel);
table.setSelection(addedIndex);
enableEditControls(addedIndex);
@@ -458,7 +458,7 @@
if (index < 0 || index > table.getItemCount()) {
return null;
}
- IndexColumnModel removed = tableModel.getIndexes().get(indexIndex).getColumns().remove(index);
+ IndexColumnModel removed = tableModel.getIndexes().get(indexIndex).getIndexColumns().remove(index);
tableViewer.remove(index);
@@ -473,14 +473,15 @@
int indexIndex = indexesTableEditor.getTableViewer().getTable().getSelectionIndex();
if (indexIndex != -1 && index != -1) {
- IndexColumnModel indexColumnModel = tableModel.getIndexes().get(indexIndex).getColumns().get(index);
+ IndexColumnModel indexColumnModel =
+ tableModel.getIndexes().get(indexIndex).getIndexColumns().get(index);
// UNDONE indexColumnModel.getColumn(). addとかremoveとか
if (radSortAsc.getSelection()) {
- jiemamyFacade.changeModelProperty(indexColumnModel, IndexColumnProperty.sortType, SortType.ASC);
+ jiemamyFacade.changeModelProperty(indexColumnModel, IndexColumnProperty.sortOrder, SortOrder.ASC);
} else if (radSortDesc.getSelection()) {
- jiemamyFacade.changeModelProperty(indexColumnModel, IndexColumnProperty.sortType, SortType.DESC);
+ jiemamyFacade.changeModelProperty(indexColumnModel, IndexColumnProperty.sortOrder, SortOrder.DESC);
} else {
- jiemamyFacade.changeModelProperty(indexColumnModel, IndexColumnProperty.sortType, null);
+ jiemamyFacade.changeModelProperty(indexColumnModel, IndexColumnProperty.sortOrder, null);
}
}
}