Revision 3310 trunk/frameworks/_fwAndami/src/com/iver/andami/Launcher.java
| Launcher.java | ||
|---|---|---|
| 109 | 109 |
import com.iver.andami.ui.MDIManagerLoadException; |
| 110 | 110 |
import com.iver.andami.ui.SplashWindow; |
| 111 | 111 |
import com.iver.andami.ui.mdiFrame.MDIFrame; |
| 112 |
import com.iver.andami.ui.mdiFrame.SelectableToolBar; |
|
| 113 | 112 |
import com.iver.andami.ui.mdiManager.MDIManagerFactory; |
| 114 | 113 |
import com.iver.utiles.XMLEntity; |
| 115 | 114 |
import com.iver.utiles.xmlEntity.generate.XmlTag; |
| ... | ... | |
| 1567 | 1566 |
if (e2.toolbar.hasPosition() && !e1.toolbar.hasPosition()) {
|
| 1568 | 1567 |
return Integer.MAX_VALUE; |
| 1569 | 1568 |
} |
| 1570 |
|
|
| 1569 |
if (e1.toolbar.getPosition() != e2.toolbar.getPosition()) |
|
| 1571 | 1570 |
return e1.toolbar.getPosition() - e2.toolbar.getPosition(); |
| 1571 |
|
|
| 1572 |
if (e1.toolbar.getActionTool().equals(e2.toolbar.getActionTool()) && e1.toolbar.getSelectableTool().equals(e2.toolbar.getSelectableTool())){
|
|
| 1573 |
return 0; |
|
| 1574 |
} |
|
| 1575 |
return 1; |
|
| 1572 | 1576 |
} |
| 1573 | 1577 |
} |
| 1574 | 1578 |
/** |
| ... | ... | |
| 1598 | 1602 |
actiontool=actiontool2; |
| 1599 | 1603 |
this.loader = loader; |
| 1600 | 1604 |
} |
| 1601 |
public SortableToolBar(PluginClassLoader loader, |
|
| 1605 |
public SortableToolBar(PluginClassLoader loader,
|
|
| 1602 | 1606 |
SkinExtensionType skinExt, ToolBar toolbar2,SelectableTool selectabletool2) {
|
| 1603 | 1607 |
extension = skinExt; |
| 1604 | 1608 |
toolbar = toolbar2; |
Also available in: Unified diff