|
|
@ -17,7 +17,6 @@ import com.fr.design.gui.chart.ChartEditPaneProvider; |
|
|
|
import com.fr.design.gui.frpane.UITitlePanel; |
|
|
|
import com.fr.design.gui.frpane.UITitlePanel; |
|
|
|
import com.fr.design.mainframe.chart.ChartEditPane; |
|
|
|
import com.fr.design.mainframe.chart.ChartEditPane; |
|
|
|
import com.fr.design.utils.gui.GUICoreUtils; |
|
|
|
import com.fr.design.utils.gui.GUICoreUtils; |
|
|
|
import org.jetbrains.annotations.Nullable; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import javax.swing.BorderFactory; |
|
|
|
import javax.swing.BorderFactory; |
|
|
|
import javax.swing.Icon; |
|
|
|
import javax.swing.Icon; |
|
|
@ -97,7 +96,7 @@ public class ChartPropertyPane extends BaseChartPropertyPane { |
|
|
|
* @param collection 收集图表 |
|
|
|
* @param collection 收集图表 |
|
|
|
* @param ePane 面板 |
|
|
|
* @param ePane 面板 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public void populateChartPropertyPane(ChartCollection collection, TargetComponent<?> ePane, @Nullable Runnable callback) { |
|
|
|
public void populateChartPropertyPane(ChartCollection collection, TargetComponent<?> ePane) { |
|
|
|
new SwingWorker<Void, Void>() { |
|
|
|
new SwingWorker<Void, Void>() { |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
protected Void doInBackground() throws Exception { |
|
|
|
protected Void doInBackground() throws Exception { |
|
|
@ -115,9 +114,6 @@ public class ChartPropertyPane extends BaseChartPropertyPane { |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
GUICoreUtils.setEnabled(chartEditPane, false); |
|
|
|
GUICoreUtils.setEnabled(chartEditPane, false); |
|
|
|
} |
|
|
|
} |
|
|
|
if (callback != null) { |
|
|
|
|
|
|
|
callback.run(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
}.execute(); |
|
|
|
}.execute(); |
|
|
|
} |
|
|
|
} |
|
|
@ -127,9 +123,9 @@ public class ChartPropertyPane extends BaseChartPropertyPane { |
|
|
|
* @param collection 收集图表 |
|
|
|
* @param collection 收集图表 |
|
|
|
* @param ePane 面板 |
|
|
|
* @param ePane 面板 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public void populateChartPropertyPane(BaseChartCollection collection, TargetComponent<?> ePane, @Nullable Runnable callback) { |
|
|
|
public void populateChartPropertyPane(BaseChartCollection collection, TargetComponent<?> ePane) { |
|
|
|
if (collection instanceof ChartCollection) { |
|
|
|
if (collection instanceof ChartCollection) { |
|
|
|
populateChartPropertyPane((ChartCollection) collection, ePane, callback); |
|
|
|
populateChartPropertyPane((ChartCollection) collection, ePane); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|