|
From: Matthias K <mat...@us...> - 2006-04-24 20:41:12
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22997/src/org/jcommander/ui/filepanel/actions Modified Files: SimpleOpenURLAction.java Log Message: Extracted the functions to show/hide a composite into new class HidableComposite Index: SimpleOpenURLAction.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions/SimpleOpenURLAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SimpleOpenURLAction.java 24 Apr 2006 15:50:04 -0000 1.4 --- SimpleOpenURLAction.java 24 Apr 2006 20:40:58 -0000 1.5 *************** *** 26,29 **** --- 26,30 ---- import org.eclipse.ui.PlatformUI; import org.jcommander.ui.filepanel.FilePanelManagerProvider; + import org.jcommander.ui.filepanel.dialogs.HideableComposite; import org.jcommander.ui.logger.LoggerPlugin; import org.jcommander.ui.utils.FixedSizeQueue; *************** *** 52,61 **** private String dir; ! private Composite messageArea; private Text messageText; - - private int messageHeight = 60; - protected static final int MAX_URL_HISTORY_SIZE = 20; --- 53,59 ---- private String dir; ! private HideableComposite messageArea; private Text messageText; protected static final int MAX_URL_HISTORY_SIZE = 20; *************** *** 72,89 **** private void createMessageArea(){ if (messageAreaVisible) return; ! Point p = getShell().getSize(); ! messageText = new Text(messageArea,SWT.MULTI|SWT.V_SCROLL|SWT.BORDER|SWT.READ_ONLY); ! GridData messageTextData = new GridData(); ! messageTextData.grabExcessHorizontalSpace=true; ! messageTextData.grabExcessVerticalSpace=true; ! messageTextData.horizontalAlignment=SWT.FILL; ! messageTextData.verticalAlignment=SWT.FILL; ! messageTextData.minimumHeight=60; ! messageText.setLayoutData(messageTextData); ! getShell().pack(); messageAreaVisible=true; - System.out.println(messageArea.getSize().y); - messageHeight=messageArea.getSize().y; - getShell().setSize(p.x, p.y+messageHeight); } --- 70,75 ---- private void createMessageArea(){ if (messageAreaVisible) return; ! messageArea.setVisible(true); messageAreaVisible=true; } *************** *** 136,140 **** } ! messageArea=new Composite(dialogArea, SWT.NONE); GridData messageData=new GridData(); messageData.horizontalAlignment=SWT.FILL; --- 122,143 ---- } ! messageArea = new HideableComposite(dialogArea,SWT.NONE) { ! ! /* (non-Javadoc) ! * @see org.jcommander.ui.filepanel.dialogs.DisappearableComposite#createContents(org.eclipse.swt.widgets.Composite) ! */ ! protected void createContents(Composite parent) { ! messageText = new Text(parent,SWT.MULTI|SWT.V_SCROLL|SWT.BORDER|SWT.READ_ONLY); ! GridData messageTextData = new GridData(); ! messageTextData.grabExcessHorizontalSpace=true; ! messageTextData.grabExcessVerticalSpace=true; ! messageTextData.horizontalAlignment=SWT.FILL; ! messageTextData.verticalAlignment=SWT.FILL; ! messageTextData.minimumHeight=60; ! messageText.setLayoutData(messageTextData); ! } ! ! }; ! GridData messageData=new GridData(); messageData.horizontalAlignment=SWT.FILL; *************** *** 142,149 **** messageData.horizontalSpan=2; messageArea.setLayoutData(messageData); - GridLayout messageLayout = new GridLayout(); - messageLayout.marginWidth=0; - messageLayout.marginHeight=1; - messageArea.setLayout(messageLayout); return dialogArea; --- 145,148 ---- |