comparison src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java @ 19:ea83f4be0cc9

remove is and os fix numberOfRectangle fill().
author Taninari YU <you@cr.ie.u-ryukyu.ac.jp>
date Wed, 29 Aug 2012 21:28:18 +0900
parents 075fb190d5d4
children 98519d16a8c3
comparison
equal deleted inserted replaced
18:075fb190d5d4 19:ea83f4be0cc9
127 127
128 try { 128 try {
129 workingSocket.setTcpNoDelay(true); // disable Nagle algorithm 129 workingSocket.setTcpNoDelay(true); // disable Nagle algorithm
130 Reader reader = new Reader(workingSocket.getInputStream()); 130 Reader reader = new Reader(workingSocket.getInputStream());
131 Writer writer = new Writer(workingSocket.getOutputStream()); 131 Writer writer = new Writer(workingSocket.getOutputStream());
132 rfb.setStream(reader,writer); 132 // rfb.setStream(reader,writer);
133 workingProtocol = new Protocol(reader, writer, 133 workingProtocol = new Protocol(reader, writer,
134 new PasswordChooser(passwordFromParams, connectionParams, containerFrame, this), 134 new PasswordChooser(passwordFromParams, connectionParams, containerFrame, this),
135 settings); 135 settings);
136 aClient = new AcceptClient(connectionParams.hostName); 136 aClient = new AcceptClient(connectionParams.hostName);
137 Thread thread = new Thread(new CreateThread(aClient)); 137 Thread thread = new Thread(new CreateThread(aClient));
142 ClipboardControllerImpl clipboardController = 142 ClipboardControllerImpl clipboardController =
143 new ClipboardControllerImpl(workingProtocol, settings.getRemoteCharsetName()); 143 new ClipboardControllerImpl(workingProtocol, settings.getRemoteCharsetName());
144 clipboardController.setEnabled(settings.isAllowClipboardTransfer()); 144 clipboardController.setEnabled(settings.isAllowClipboardTransfer());
145 settings.addListener(clipboardController); 145 settings.addListener(clipboardController);
146 146
147 surface = new Surface(workingProtocol, this, uiSettings.getScaleFactor()); 147 surface = new Surface(workingProtocol, this, uiSettings.getScaleFactor()); // this method
148 /*
149 settings.addListener(this);
150 uiSettings.addListener(surface);
151 containerFrame = createContainer();
152 connectionManager.setContainerFrame(containerFrame);
153 updateFrameTitle();
154 */
148 155
149 workingProtocol.startNormalHandling(this, surface, clipboardController,rfb); 156 workingProtocol.startNormalHandling(this, surface, clipboardController,rfb);
150 rfb.setInitData(workingProtocol.getInitData()); 157 rfb.setInitData(workingProtocol.getInitData());
151 // workingProtocol.startNormalHandling(this, surface, clipboardController); 158 // workingProtocol.startNormalHandling(this, surface, clipboardController);
152 tryAgain = false; 159 tryAgain = false;